The patch titled
genirq: cleanup: no_irq_type -> no_irq_chip rename
has been added to the -mm tree. Its filename is
genirq-cleanup-no_irq_type-no_irq_chip-rename.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: genirq: cleanup: no_irq_type -> no_irq_chip rename
From: Ingo Molnar <mingo@xxxxxxx>
Rename no_irq_type to no_irq_chip.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
kernel/irq/handle.c | 6 +++---
kernel/irq/manage.c | 2 +-
kernel/irq/proc.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff -puN kernel/irq/handle.c~genirq-cleanup-no_irq_type-no_irq_chip-rename kernel/irq/handle.c
--- devel/kernel/irq/handle.c~genirq-cleanup-no_irq_type-no_irq_chip-rename 2006-05-22 15:15:41.000000000 -0700
+++ devel-akpm/kernel/irq/handle.c 2006-05-22 15:15:41.000000000 -0700
@@ -45,7 +45,7 @@ handle_bad_irq(unsigned int irq, struct
struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = {
[0 ... NR_IRQS-1] = {
.status = IRQ_DISABLED,
- .chip = &no_irq_type,
+ .chip = &no_irq_chip,
.handle_irq = handle_bad_irq,
.depth = 1,
.lock = SPIN_LOCK_UNLOCKED,
@@ -79,8 +79,8 @@ static unsigned int noop_ret(unsigned in
/*
* Generic no controller implementation
*/
-struct hw_interrupt_type no_irq_type = {
- .typename = "none",
+struct irq_chip no_irq_chip = {
+ .name = "none",
.startup = noop_ret,
.shutdown = noop,
.enable = noop,
diff -puN kernel/irq/manage.c~genirq-cleanup-no_irq_type-no_irq_chip-rename kernel/irq/manage.c
--- devel/kernel/irq/manage.c~genirq-cleanup-no_irq_type-no_irq_chip-rename 2006-05-22 15:15:41.000000000 -0700
+++ devel-akpm/kernel/irq/manage.c 2006-05-22 15:15:41.000000000 -0700
@@ -199,7 +199,7 @@ int setup_irq(unsigned int irq, struct i
if (irq >= NR_IRQS)
return -EINVAL;
- if (desc->chip == &no_irq_type)
+ if (desc->chip == &no_irq_chip)
return -ENOSYS;
/*
* Some drivers like serial.c use request_irq() heavily,
diff -puN kernel/irq/proc.c~genirq-cleanup-no_irq_type-no_irq_chip-rename kernel/irq/proc.c
--- devel/kernel/irq/proc.c~genirq-cleanup-no_irq_type-no_irq_chip-rename 2006-05-22 15:15:41.000000000 -0700
+++ devel-akpm/kernel/irq/proc.c 2006-05-22 15:15:41.000000000 -0700
@@ -117,7 +117,7 @@ void register_irq_proc(unsigned int irq)
char name [MAX_NAMELEN];
if (!root_irq_dir ||
- (irq_desc[irq].chip == &no_irq_type) ||
+ (irq_desc[irq].chip == &no_irq_chip) ||
irq_desc[irq].dir)
return;
_
Patches currently in -mm which might be from mingo@xxxxxxx are
git-acpi.patch
fix-drivers-mfd-ucb1x00-corec-irq-probing-bug.patch
git-dvb.patch
git-netdev-all.patch
fix-for-serial-uart-lockup.patch
qla2xxx-lock-ordering-fix.patch
qla2xxx-lock-ordering-fix-warning-fix.patch
swapless-pm-add-r-w-migration-entries-fix.patch
i386-break-out-of-recursion-in-stackframe-walk.patch
work-around-ppc64-bootup-bug-by-making-mutex-debugging-save-restore-irqs.patch
kernel-kernel-cpuc-to-mutexes.patch
cond-resched-might-sleep-fix.patch
define-__raw_get_cpu_var-and-use-it.patch
ide-cd-end-of-media-error-fix.patch
time-clocksource-infrastructure.patch
sched-comment-bitmap-size-accounting.patch
sched-fix-interactive-ceiling-code.patch
sched-implement-smpnice.patch
sched-protect-calculation-of-max_pull-from-integer-wrap.patch
sched-store-weighted-load-on-up.patch
sched-add-discrete-weighted-cpu-load-function.patch
sched-prevent-high-load-weight-tasks-suppressing-balancing.patch
sched-improve-stability-of-smpnice-load-balancing.patch
sched-improve-smpnice-load-balancing-when-load-per-task.patch
smpnice-dont-consider-sched-groups-which-are-lightly-loaded-for-balancing.patch
smpnice-dont-consider-sched-groups-which-are-lightly-loaded-for-balancing-fix.patch
sched-modify-move_tasks-to-improve-load-balancing-outcomes.patch
sched-avoid-unnecessarily-moving-highest-priority-task-move_tasks.patch
sched-avoid-unnecessarily-moving-highest-priority-task-move_tasks-fix-2.patch
sched_domain-handle-kmalloc-failure.patch
sched_domain-handle-kmalloc-failure-fix.patch
sched_domain-dont-use-gfp_atomic.patch
sched_domain-use-kmalloc_node.patch
sched_domain-allocate-sched_group-structures-dynamically.patch
sched-add-above-background-load-function.patch
mm-implement-swap-prefetching-fix.patch
pi-futex-futex-code-cleanups.patch
pi-futex-futex-code-cleanups-fix.patch
pi-futex-introduce-debug_check_no_locks_freed.patch
pi-futex-add-plist-implementation.patch
pi-futex-scheduler-support-for-pi.patch
pi-futex-rt-mutex-core.patch
pi-futex-rt-mutex-core-fix-timeout-race.patch
pi-futex-rt-mutex-docs.patch
pi-futex-rt-mutex-debug.patch
pi-futex-rt-mutex-tester.patch
pi-futex-rt-mutex-futex-api.patch
pi-futex-futex_lock_pi-futex_unlock_pi-support.patch
pi-futex-v2.patch
pi-futex-v3.patch
pi-futex-patchset-v4.patch
pi-futex-patchset-v4-update.patch
pi-futex-patchset-v4-fix.patch
rtmutex-remove-buggy-bug_on-in-pi-boosting-code.patch
futex-pi-enforce-waiter-bit-when-owner-died-is-detected.patch
rtmutex-debug-printk-correct-task-information.patch
futex-pi-make-use-of-restart_block-when-interrupted.patch
document-futex-pi-design.patch
futex_requeue-optimization.patch
reiser4.patch
genirq-rename-desc-handler-to-desc-chip.patch
genirq-rename-desc-handler-to-desc-chip-power-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
genirq-sem2mutex-probe_sem-probing_active.patch
genirq-cleanup-merge-irq_affinity-into-irq_desc.patch
genirq-cleanup-remove-irq_descp.patch
genirq-cleanup-remove-fastcall.patch
genirq-cleanup-misc-code-cleanups.patch
genirq-cleanup-reduce-irq_desc_t-use-mark-it-obsolete.patch
genirq-cleanup-include-linux-irqh.patch
genirq-cleanup-merge-irq_dir-smp_affinity_entry-into-irq_desc.patch
genirq-cleanup-merge-pending_irq_cpumask-into-irq_desc.patch
genirq-cleanup-turn-arch_has_irq_per_cpu-into-config_irq_per_cpu.patch
genirq-debug-better-debug-printout-in-enable_irq.patch
genirq-add-retrigger-irq-op-to-consolidate-hw_irq_resend.patch
genirq-doc-comment-include-linux-irqh-structures.patch
genirq-doc-handle_irq_event-and-__do_irq-comments.patch
genirq-cleanup-no_irq_type-cleanups.patch
genirq-doc-add-design-documentation.patch
genirq-add-genirq-sw-irq-retrigger.patch
genirq-add-irq_noprobe-support.patch
genirq-add-irq_norequest-support.patch
genirq-add-irq_noautoen-support.patch
genirq-update-copyrights.patch
genirq-core.patch
genirq-add-irq-chip-support.patch
genirq-add-handle_bad_irq.patch
genirq-add-irq-wake-power-management-support.patch
genirq-add-sa_trigger-support.patch
genirq-cleanup-no_irq_type-no_irq_chip-rename.patch
genirq-convert-the-x86_64-architecture-to-irq-chips.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-more-verbose-debugging-on-unexpected-irq-vectors.patch
detect-atomic-counter-underflows.patch
debug-shared-irqs.patch
make-frame_pointer-default=y.patch
mutex-subsystem-synchro-test-module.patch
add-print_fatal_signals-support.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
