* Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] [not found] ` <20090114175126.GA21078@elte.hu> @ 2009-01-14 23:43 ` Mike Travis 2009-01-15 10:14 ` Ingo Molnar 2009-01-15 10:16 ` Ingo Molnar 0 siblings, 2 replies; 12+ messages in thread From: Mike Travis @ 2009-01-14 23:43 UTC (permalink / raw) To: Ingo Molnar Cc: Rusty Russell, Yinghai Lu, Thomas Gleixner, H. Peter Anvin, Tony Luck, IA64, Ralf Baechle, linux-mips, David Howells, Koichi Yasutake, linux-am33-list, David S. Miller, SPARC, LKML Ingo Molnar wrote: > also, with latest tip/master the ia64 cross-build still fails: > > /home/mingo/tip/arch/ia64/kernel/irq_ia64.c: In function `ia64_handle_irq': > /home/mingo/tip/arch/ia64/kernel/irq_ia64.c:498: error: structure has no member named `irqs' > /home/mingo/tip/arch/ia64/kernel/irq_ia64.c:500: error: structure has no member named `irqs' > /home/mingo/tip/arch/ia64/kernel/irq_ia64.c: In function `ia64_process_pending_intr': > /home/mingo/tip/arch/ia64/kernel/irq_ia64.c:556: error: structure has no member named `irqs' > /home/mingo/tip/arch/ia64/kernel/irq_ia64.c:558: error: structure has no member named `irqs' > make[2]: *** [arch/ia64/kernel/irq_ia64.o] Error 1 > make[2]: *** Waiting for unfinished jobs.... > > and so does the MIPS build: > > /home/mingo/tip/arch/mips/sgi-ip22/ip22-int.c: In function 'indy_buserror_irq': > /home/mingo/tip/arch/mips/sgi-ip22/ip22-int.c:158: error: 'struct kernel_stat' has no member named 'irqs' > make[2]: *** [arch/mips/sgi-ip22/ip22-int.o] Error 1 > make[2]: *** Waiting for unfinished jobs.... > /home/mingo/tip/arch/mips/sgi-ip22/ip22-time.c: In function 'indy_8254timer_irq': > /home/mingo/tip/arch/mips/sgi-ip22/ip22-time.c:125: error: 'struct kernel_stat' has no member named 'irqs' > make[2]: *** [arch/mips/sgi-ip22/ip22-time.o] Error 1 > make[1]: *** [arch/mips/sgi-ip22] Error 2 > make[1]: *** Waiting for unfinished jobs.... > > Ingo Hi Ingo, This appears to be a fallout of the sparse irqs changes. Here is a suggested patch. Btw, my ia64 build fails under tip/cpus4096 because this commit is not present: commit e65e49d0f3714f4a6a42f6f6a19926ba33fcda75 Author: Mike Travis <travis@sgi.com> Date: Mon Jan 12 15:27:13 2009 -0800 irq: update all arches for new irq_desc With that patch also applied, the defconfig for ia64 builds correctly. (Sorry, cannot test build the others right now.) Thanks, Mike --- Subject: irq: fix build errors referencing old kstat.irqs array Impact: fix build error Since the SPARSE IRQS changes redefined how the kstat irqs are organized, arch's must use the new accessor function: kstat_incr_irqs_this_cpu(irq, DESC); If CONFIG_SPARSE_IRQS is set, then DESC is a pointer to the irq_desc which has a pointer to the kstat_irqs. If not, then the .irqs field of struct kernel_stat is used instead. Signed-off-by: Mike Travis <travis@sgi.com> # IA64 Cc: Tony Luck <tony.luck@intel.com> Cc: <linux-ia64@vger.kernel.org> # MIPS Cc: Ralf Baechle <ralf@linux-mips.org> Cc: <linux-mips@linux-mips.org> # MN10300 Cc: David Howells <dhowells@redhat.com> Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com> Cc: <linux-am33-list@redhat.com> # SPARC Cc: David S. Miller <davem@davemloft.net> Cc: <sparclinux@vger.kernel.org> --- arch/ia64/kernel/irq_ia64.c | 12 ++++++++---- arch/mips/kernel/smtc.c | 4 +++- arch/mips/sgi-ip22/ip22-int.c | 2 +- arch/mips/sgi-ip22/ip22-time.c | 2 +- arch/mips/sibyte/bcm1480/smp.c | 3 ++- arch/mips/sibyte/sb1250/smp.c | 3 ++- arch/mn10300/kernel/mn10300-watchdog.c | 3 ++- arch/sparc/kernel/time_64.c | 2 +- 8 files changed, 20 insertions(+), 11 deletions(-) --- linux-2.6-for-ingo.orig/arch/ia64/kernel/irq_ia64.c +++ linux-2.6-for-ingo/arch/ia64/kernel/irq_ia64.c @@ -493,11 +493,13 @@ ia64_handle_irq (ia64_vector vector, str saved_tpr = ia64_getreg(_IA64_REG_CR_TPR); ia64_srlz_d(); while (vector != IA64_SPURIOUS_INT_VECTOR) { + struct irq_desc *desc = irq_to_desc(vector); + if (unlikely(IS_LOCAL_TLB_FLUSH(vector))) { smp_local_flush_tlb(); - kstat_this_cpu.irqs[vector]++; + kstat_incr_irqs_this_cpu(vector, desc); } else if (unlikely(IS_RESCHEDULE(vector))) - kstat_this_cpu.irqs[vector]++; + kstat_incr_irqs_this_cpu(vector, desc); else { int irq = local_vector_to_irq(vector); @@ -551,11 +553,13 @@ void ia64_process_pending_intr(void) * Perform normal interrupt style processing */ while (vector != IA64_SPURIOUS_INT_VECTOR) { + struct irq_desc *desc = irq_to_desc(vector); + if (unlikely(IS_LOCAL_TLB_FLUSH(vector))) { smp_local_flush_tlb(); - kstat_this_cpu.irqs[vector]++; + kstat_incr_irqs_this_cpu(vector, desc); } else if (unlikely(IS_RESCHEDULE(vector))) - kstat_this_cpu.irqs[vector]++; + kstat_incr_irqs_this_cpu(vector, desc); else { struct pt_regs *old_regs = set_irq_regs(NULL); int irq = local_vector_to_irq(vector); --- linux-2.6-for-ingo.orig/arch/mips/kernel/smtc.c +++ linux-2.6-for-ingo/arch/mips/kernel/smtc.c @@ -921,11 +921,13 @@ void ipi_decode(struct smtc_ipi *pipi) struct clock_event_device *cd; void *arg_copy = pipi->arg; int type_copy = pipi->type; + int irq = MIPS_CPU_IRQ_BASE + 1; + smtc_ipi_nq(&freeIPIq, pipi); switch (type_copy) { case SMTC_CLOCK_TICK: irq_enter(); - kstat_this_cpu.irqs[MIPS_CPU_IRQ_BASE + 1]++; + kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq)); cd = &per_cpu(mips_clockevent_device, cpu); cd->event_handler(cd); irq_exit(); --- linux-2.6-for-ingo.orig/arch/mips/sgi-ip22/ip22-int.c +++ linux-2.6-for-ingo/arch/mips/sgi-ip22/ip22-int.c @@ -155,7 +155,7 @@ static void indy_buserror_irq(void) int irq = SGI_BUSERR_IRQ; irq_enter(); - kstat_this_cpu.irqs[irq]++; + kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq)); ip22_be_interrupt(irq); irq_exit(); } --- linux-2.6-for-ingo.orig/arch/mips/sgi-ip22/ip22-time.c +++ linux-2.6-for-ingo/arch/mips/sgi-ip22/ip22-time.c @@ -122,7 +122,7 @@ void indy_8254timer_irq(void) char c; irq_enter(); - kstat_this_cpu.irqs[irq]++; + kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq)); printk(KERN_ALERT "Oops, got 8254 interrupt.\n"); ArcRead(0, &c, 1, &cnt); ArcEnterInteractiveMode(); --- linux-2.6-for-ingo.orig/arch/mips/sibyte/bcm1480/smp.c +++ linux-2.6-for-ingo/arch/mips/sibyte/bcm1480/smp.c @@ -178,9 +178,10 @@ struct plat_smp_ops bcm1480_smp_ops = { void bcm1480_mailbox_interrupt(void) { int cpu = smp_processor_id(); + int irq = K_BCM1480_INT_MBOX_0_0; unsigned int action; - kstat_this_cpu.irqs[K_BCM1480_INT_MBOX_0_0]++; + kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq)); /* Load the mailbox register to figure out what we're supposed to do */ action = (__raw_readq(mailbox_0_regs[cpu]) >> 48) & 0xffff; --- linux-2.6-for-ingo.orig/arch/mips/sibyte/sb1250/smp.c +++ linux-2.6-for-ingo/arch/mips/sibyte/sb1250/smp.c @@ -166,9 +166,10 @@ struct plat_smp_ops sb_smp_ops = { void sb1250_mailbox_interrupt(void) { int cpu = smp_processor_id(); + int irq = K_INT_MBOX_0; unsigned int action; - kstat_this_cpu.irqs[K_INT_MBOX_0]++; + kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq)); /* Load the mailbox register to figure out what we're supposed to do */ action = (____raw_readq(mailbox_regs[cpu]) >> 48) & 0xffff; --- linux-2.6-for-ingo.orig/arch/mn10300/kernel/mn10300-watchdog.c +++ linux-2.6-for-ingo/arch/mn10300/kernel/mn10300-watchdog.c @@ -130,6 +130,7 @@ void watchdog_interrupt(struct pt_regs * * the stack NMI-atomically, it's safe to use smp_processor_id(). */ int sum, cpu = smp_processor_id(); + int irq = NMIIRQ; u8 wdt, tmp; wdt = WDCTR & ~WDCTR_WDCNE; @@ -138,7 +139,7 @@ void watchdog_interrupt(struct pt_regs * NMICR = NMICR_WDIF; nmi_count(cpu)++; - kstat_this_cpu.irqs[NMIIRQ]++; + kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq)); sum = irq_stat[cpu].__irq_count; if (last_irq_sums[cpu] == sum) { --- linux-2.6-for-ingo.orig/arch/sparc/kernel/time_64.c +++ linux-2.6-for-ingo/arch/sparc/kernel/time_64.c @@ -727,7 +727,7 @@ void timer_interrupt(int irq, struct pt_ irq_enter(); - kstat_this_cpu.irqs[0]++; + kstat_incr_irqs_this_cpu(0, irq_to_desc(0)); if (unlikely(!evt->event_handler)) { printk(KERN_WARNING ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] 2009-01-14 23:43 ` crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] Mike Travis @ 2009-01-15 10:14 ` Ingo Molnar 2009-01-15 16:44 ` Mike Travis 2009-01-15 10:16 ` Ingo Molnar 1 sibling, 1 reply; 12+ messages in thread From: Ingo Molnar @ 2009-01-15 10:14 UTC (permalink / raw) To: Mike Travis Cc: Rusty Russell, Yinghai Lu, Thomas Gleixner, H. Peter Anvin, Tony Luck, IA64, Ralf Baechle, linux-mips, David Howells, Koichi Yasutake, linux-am33-list, David S. Miller, SPARC, LKML * Mike Travis <travis@sgi.com> wrote: > Ingo Molnar wrote: > > also, with latest tip/master the ia64 cross-build still fails: > > > > /home/mingo/tip/arch/ia64/kernel/irq_ia64.c: In function `ia64_handle_irq': > > /home/mingo/tip/arch/ia64/kernel/irq_ia64.c:498: error: structure has no member named `irqs' > > /home/mingo/tip/arch/ia64/kernel/irq_ia64.c:500: error: structure has no member named `irqs' > > /home/mingo/tip/arch/ia64/kernel/irq_ia64.c: In function `ia64_process_pending_intr': > > /home/mingo/tip/arch/ia64/kernel/irq_ia64.c:556: error: structure has no member named `irqs' > > /home/mingo/tip/arch/ia64/kernel/irq_ia64.c:558: error: structure has no member named `irqs' > > make[2]: *** [arch/ia64/kernel/irq_ia64.o] Error 1 > > make[2]: *** Waiting for unfinished jobs.... > > > > and so does the MIPS build: > > > > /home/mingo/tip/arch/mips/sgi-ip22/ip22-int.c: In function 'indy_buserror_irq': > > /home/mingo/tip/arch/mips/sgi-ip22/ip22-int.c:158: error: 'struct kernel_stat' has no member named 'irqs' > > make[2]: *** [arch/mips/sgi-ip22/ip22-int.o] Error 1 > > make[2]: *** Waiting for unfinished jobs.... > > /home/mingo/tip/arch/mips/sgi-ip22/ip22-time.c: In function 'indy_8254timer_irq': > > /home/mingo/tip/arch/mips/sgi-ip22/ip22-time.c:125: error: 'struct kernel_stat' has no member named 'irqs' > > make[2]: *** [arch/mips/sgi-ip22/ip22-time.o] Error 1 > > make[1]: *** [arch/mips/sgi-ip22] Error 2 > > make[1]: *** Waiting for unfinished jobs.... > > > > Ingo > > Hi Ingo, > > This appears to be a fallout of the sparse irqs changes. Here is a > suggested patch. > > Btw, my ia64 build fails under tip/cpus4096 because this commit is not > present: > > commit e65e49d0f3714f4a6a42f6f6a19926ba33fcda75 > Author: Mike Travis <travis@sgi.com> > Date: Mon Jan 12 15:27:13 2009 -0800 > > irq: update all arches for new irq_desc it is present: [mingo@hera tip]$ git log cpus4096 | grep e65e49d commit e65e49d0f3714f4a6a42f6f6a19926ba33fcda75 Ingo ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] 2009-01-15 10:14 ` Ingo Molnar @ 2009-01-15 16:44 ` Mike Travis 2009-01-15 17:35 ` Ingo Molnar 2009-01-15 17:59 ` Andreas Schwab 0 siblings, 2 replies; 12+ messages in thread From: Mike Travis @ 2009-01-15 16:44 UTC (permalink / raw) To: Ingo Molnar Cc: Rusty Russell, Yinghai Lu, Thomas Gleixner, H. Peter Anvin, Tony Luck, IA64, Ralf Baechle, linux-mips, David Howells, Koichi Yasutake, linux-am33-list, David S. Miller, SPARC, LKML Ingo Molnar wrote: > * Mike Travis <travis@sgi.com> wrote: > >> Ingo Molnar wrote: >>> also, with latest tip/master the ia64 cross-build still fails: >>> >>> /home/mingo/tip/arch/ia64/kernel/irq_ia64.c: In function `ia64_handle_irq': >>> /home/mingo/tip/arch/ia64/kernel/irq_ia64.c:498: error: structure has no member named `irqs' >>> /home/mingo/tip/arch/ia64/kernel/irq_ia64.c:500: error: structure has no member named `irqs' >>> /home/mingo/tip/arch/ia64/kernel/irq_ia64.c: In function `ia64_process_pending_intr': >>> /home/mingo/tip/arch/ia64/kernel/irq_ia64.c:556: error: structure has no member named `irqs' >>> /home/mingo/tip/arch/ia64/kernel/irq_ia64.c:558: error: structure has no member named `irqs' >>> make[2]: *** [arch/ia64/kernel/irq_ia64.o] Error 1 >>> make[2]: *** Waiting for unfinished jobs.... >>> >>> and so does the MIPS build: >>> >>> /home/mingo/tip/arch/mips/sgi-ip22/ip22-int.c: In function 'indy_buserror_irq': >>> /home/mingo/tip/arch/mips/sgi-ip22/ip22-int.c:158: error: 'struct kernel_stat' has no member named 'irqs' >>> make[2]: *** [arch/mips/sgi-ip22/ip22-int.o] Error 1 >>> make[2]: *** Waiting for unfinished jobs.... >>> /home/mingo/tip/arch/mips/sgi-ip22/ip22-time.c: In function 'indy_8254timer_irq': >>> /home/mingo/tip/arch/mips/sgi-ip22/ip22-time.c:125: error: 'struct kernel_stat' has no member named 'irqs' >>> make[2]: *** [arch/mips/sgi-ip22/ip22-time.o] Error 1 >>> make[1]: *** [arch/mips/sgi-ip22] Error 2 >>> make[1]: *** Waiting for unfinished jobs.... >>> >>> Ingo >> Hi Ingo, >> >> This appears to be a fallout of the sparse irqs changes. Here is a >> suggested patch. >> >> Btw, my ia64 build fails under tip/cpus4096 because this commit is not >> present: >> >> commit e65e49d0f3714f4a6a42f6f6a19926ba33fcda75 >> Author: Mike Travis <travis@sgi.com> >> Date: Mon Jan 12 15:27:13 2009 -0800 >> >> irq: update all arches for new irq_desc > > it is present: > > [mingo@hera tip]$ git log cpus4096 | grep e65e49d > commit e65e49d0f3714f4a6a42f6f6a19926ba33fcda75 > > Ingo Hmm, the exact same command on my work tree produces nothing. If I generate a whole new tip/cpus4096 tree, it's then there. Once again a victim of git remote updating - not! There must be something that I'm doing wrong: Non-working tree: 21> git-describe v2.6.29-rc1-19-g92296c6 22> git-status # On branch cpus4096 # Your branch is behind 'tip/cpus4096' by 233 commits, and can be fast-forwarded. 23> git-remote update Updating linus Updating tip 24> git-status # On branch cpus4096 # Your branch is behind 'tip/cpus4096' by 233 commits, and can be fast-forwarded. 25> git-describe v2.6.29-rc1-19-g92296c6 New (working) tree: 2> git-describe v2.6.29-rc1-252-g5cd7376 ??? Thanks, Mike ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] 2009-01-15 16:44 ` Mike Travis @ 2009-01-15 17:35 ` Ingo Molnar 2009-01-15 17:59 ` Andreas Schwab 1 sibling, 0 replies; 12+ messages in thread From: Ingo Molnar @ 2009-01-15 17:35 UTC (permalink / raw) To: Mike Travis Cc: Rusty Russell, Yinghai Lu, Thomas Gleixner, H. Peter Anvin, Tony Luck, IA64, Ralf Baechle, linux-mips, David Howells, Koichi Yasutake, linux-am33-list, David S. Miller, SPARC, LKML * Mike Travis <travis@sgi.com> wrote: > Non-working tree: > > 21> git-describe > v2.6.29-rc1-19-g92296c6 > > 22> git-status why do you use git-dash commands? Latest git does not have them. Maybe you have an older Git version? Ingo ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] 2009-01-15 16:44 ` Mike Travis 2009-01-15 17:35 ` Ingo Molnar @ 2009-01-15 17:59 ` Andreas Schwab 2009-01-15 20:34 ` Mike Travis 1 sibling, 1 reply; 12+ messages in thread From: Andreas Schwab @ 2009-01-15 17:59 UTC (permalink / raw) To: Mike Travis Cc: Ingo Molnar, Rusty Russell, Yinghai Lu, Thomas Gleixner, H. Peter Anvin, Tony Luck, IA64, Ralf Baechle, linux-mips, David Howells, Koichi Yasutake, linux-am33-list, David S. Miller, SPARC, LKML Mike Travis <travis@sgi.com> writes: > 23> git-remote update > Updating linus > Updating tip This only updates the remotes, but does not merge anything into your local branch. You need to run "git merge tip" to do that. Andreas. -- Andreas Schwab, SuSE Labs, schwab@suse.de SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] 2009-01-15 17:59 ` Andreas Schwab @ 2009-01-15 20:34 ` Mike Travis 2009-01-16 9:44 ` Andreas Schwab 0 siblings, 1 reply; 12+ messages in thread From: Mike Travis @ 2009-01-15 20:34 UTC (permalink / raw) To: Andreas Schwab; +Cc: LKML Andreas Schwab wrote: > Mike Travis <travis@sgi.com> writes: > >> 23> git-remote update >> Updating linus >> Updating tip > > This only updates the remotes, but does not merge anything into your > local branch. You need to run "git merge tip" to do that. > > Andreas. > Ahh, that's the secret ingredient! In my particular instance it's: git merge tip/cpus4096 (Git has been quite a learning experience... ;-) Thanks! Mike ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] 2009-01-15 20:34 ` Mike Travis @ 2009-01-16 9:44 ` Andreas Schwab 0 siblings, 0 replies; 12+ messages in thread From: Andreas Schwab @ 2009-01-16 9:44 UTC (permalink / raw) To: Mike Travis; +Cc: LKML Mike Travis <travis@sgi.com> writes: > Andreas Schwab wrote: >> Mike Travis <travis@sgi.com> writes: >> >>> 23> git-remote update >>> Updating linus >>> Updating tip >> >> This only updates the remotes, but does not merge anything into your >> local branch. You need to run "git merge tip" to do that. >> >> Andreas. >> > > Ahh, that's the secret ingredient! > > In my particular instance it's: > > git merge tip/cpus4096 > > (Git has been quite a learning experience... ;-) I wonder if git pull wouldn't work as well. Andreas. -- Andreas Schwab, SuSE Labs, schwab@suse.de SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] 2009-01-14 23:43 ` crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] Mike Travis 2009-01-15 10:14 ` Ingo Molnar @ 2009-01-15 10:16 ` Ingo Molnar 2009-01-15 12:21 ` Ingo Molnar 2009-01-15 16:46 ` Mike Travis 1 sibling, 2 replies; 12+ messages in thread From: Ingo Molnar @ 2009-01-15 10:16 UTC (permalink / raw) To: Mike Travis Cc: Rusty Russell, Yinghai Lu, Thomas Gleixner, H. Peter Anvin, Tony Luck, IA64, Ralf Baechle, linux-mips, David Howells, Koichi Yasutake, linux-am33-list, David S. Miller, SPARC, LKML * Mike Travis <travis@sgi.com> wrote: > Subject: irq: fix build errors referencing old kstat.irqs array i've picked this up into tip/cpus4096, thanks Mike, Ingo ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] 2009-01-15 10:16 ` Ingo Molnar @ 2009-01-15 12:21 ` Ingo Molnar 2009-01-15 17:30 ` Mike Travis 2009-01-15 16:46 ` Mike Travis 1 sibling, 1 reply; 12+ messages in thread From: Ingo Molnar @ 2009-01-15 12:21 UTC (permalink / raw) To: Mike Travis Cc: Rusty Russell, Yinghai Lu, Thomas Gleixner, H. Peter Anvin, Tony Luck, IA64, Ralf Baechle, linux-mips, David Howells, Koichi Yasutake, linux-am33-list, David S. Miller, SPARC, LKML FYI, there's new warnings due to cpumask changes: arch/x86/kernel/cpu/intel_cacheinfo.c: In function ‘show_cache_disable’: arch/x86/kernel/cpu/intel_cacheinfo.c:710: warning: unused variable ‘mask’ arch/x86/kernel/cpu/intel_cacheinfo.c: In function ‘store_cache_disable’: arch/x86/kernel/cpu/intel_cacheinfo.c:745: warning: unused variable ‘mask’ on 32-bit defconfig. Ingo ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] 2009-01-15 12:21 ` Ingo Molnar @ 2009-01-15 17:30 ` Mike Travis 2009-01-15 17:37 ` Ingo Molnar 0 siblings, 1 reply; 12+ messages in thread From: Mike Travis @ 2009-01-15 17:30 UTC (permalink / raw) To: Ingo Molnar; +Cc: Rusty Russell, Thomas Gleixner, H. Peter Anvin, LKML Ingo Molnar wrote: > FYI, there's new warnings due to cpumask changes: > > arch/x86/kernel/cpu/intel_cacheinfo.c: In function ‘show_cache_disable’: > arch/x86/kernel/cpu/intel_cacheinfo.c:710: warning: unused variable ‘mask’ > arch/x86/kernel/cpu/intel_cacheinfo.c: In function ‘store_cache_disable’: > arch/x86/kernel/cpu/intel_cacheinfo.c:745: warning: unused variable ‘mask’ > > on 32-bit defconfig. > > Ingo Hi Ingo, You can pull the following patch to fix this build warning. Thanks! Mike --- The following changes since commit e46d51787e23a607cac5f593ac9926743a636dff: Ingo Molnar (1): Merge branch 'master' of ssh://master.kernel.org/.../travis/linux-2.6-cpus4096-for-ingo into cpus4096 are available in the git repository at: ssh://master.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo master Mike Travis (1): x86: fix build warning when CONFIG_NUMA not defined. arch/x86/include/asm/topology.h | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) commit f2a082711905312dc7b6675e913fee0c4689f7ae Author: Mike Travis <travis@sgi.com> Date: Thu Jan 15 09:19:32 2009 -0800 x86: fix build warning when CONFIG_NUMA not defined. Impact: fix build warning The macro cpu_to_node did not reference it's argument, and instead simply returned a 0. This causes a "unused variable" warning if it's the only reference in a function (show_cache_disable). Replace it with the more correct inline function. Signed-off-by: Mike Travis <travis@sgi.com> diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 4e2f2e0..d0c68e2 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -192,9 +192,20 @@ extern int __node_distance(int, int); #else /* !CONFIG_NUMA */ -#define numa_node_id() 0 -#define cpu_to_node(cpu) 0 -#define early_cpu_to_node(cpu) 0 +static inline int numa_node_id(void) +{ + return 0; +} + +static inline int cpu_to_node(int cpu) +{ + return 0; +} + +static inline int early_cpu_to_node(int cpu) +{ + return 0; +} static inline const cpumask_t *cpumask_of_node(int node) { ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] 2009-01-15 17:30 ` Mike Travis @ 2009-01-15 17:37 ` Ingo Molnar 0 siblings, 0 replies; 12+ messages in thread From: Ingo Molnar @ 2009-01-15 17:37 UTC (permalink / raw) To: Mike Travis; +Cc: Rusty Russell, Thomas Gleixner, H. Peter Anvin, LKML * Mike Travis <travis@sgi.com> wrote: > Ingo Molnar wrote: > > FYI, there's new warnings due to cpumask changes: > > > > arch/x86/kernel/cpu/intel_cacheinfo.c: In function ‘show_cache_disable’: > > arch/x86/kernel/cpu/intel_cacheinfo.c:710: warning: unused variable ‘mask’ > > arch/x86/kernel/cpu/intel_cacheinfo.c: In function ‘store_cache_disable’: > > arch/x86/kernel/cpu/intel_cacheinfo.c:745: warning: unused variable ‘mask’ > > > > on 32-bit defconfig. > > > > Ingo > > Hi Ingo, > > You can pull the following patch to fix this build warning. pulled into tip/cpus4096, thanks Mike! Ingo ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] 2009-01-15 10:16 ` Ingo Molnar 2009-01-15 12:21 ` Ingo Molnar @ 2009-01-15 16:46 ` Mike Travis 1 sibling, 0 replies; 12+ messages in thread From: Mike Travis @ 2009-01-15 16:46 UTC (permalink / raw) To: Ingo Molnar Cc: Rusty Russell, Yinghai Lu, Thomas Gleixner, H. Peter Anvin, Tony Luck, IA64, Ralf Baechle, linux-mips, David Howells, Koichi Yasutake, linux-am33-list, David S. Miller, SPARC, LKML Ingo Molnar wrote: > * Mike Travis <travis@sgi.com> wrote: > >> Subject: irq: fix build errors referencing old kstat.irqs array > > i've picked this up into tip/cpus4096, thanks Mike, > > Ingo I sent it as a patch because I wasn't sure if you wanted in the cpus4096 branch or the sparseirqs branch. Thanks, Mike ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2009-01-16 9:44 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <496BF6D5.9030403@sgi.com>
[not found] ` <20090113130048.GB31147@elte.hu>
[not found] ` <496CAF5A.3010304@sgi.com>
[not found] ` <496D0F46.2010907@sgi.com>
[not found] ` <496D2172.6030608@sgi.com>
[not found] ` <20090114165431.GA18826@elte.hu>
[not found] ` <20090114165524.GA21742@elte.hu>
[not found] ` <20090114175126.GA21078@elte.hu>
2009-01-14 23:43 ` crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] Mike Travis
2009-01-15 10:14 ` Ingo Molnar
2009-01-15 16:44 ` Mike Travis
2009-01-15 17:35 ` Ingo Molnar
2009-01-15 17:59 ` Andreas Schwab
2009-01-15 20:34 ` Mike Travis
2009-01-16 9:44 ` Andreas Schwab
2009-01-15 10:16 ` Ingo Molnar
2009-01-15 12:21 ` Ingo Molnar
2009-01-15 17:30 ` Mike Travis
2009-01-15 17:37 ` Ingo Molnar
2009-01-15 16:46 ` Mike Travis
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).