1. 13 5月, 2008 1 次提交
  2. 10 5月, 2008 3 次提交
  3. 08 5月, 2008 7 次提交
  4. 05 5月, 2008 4 次提交
    • I
      sysfs: build fix · e73b65f1
      Ingo Molnar 提交于
      x86.git testing found the following build failure on v2.6.26-rc1:
      
        In file included from include/linux/kobject.h:22,
                         from include/linux/module.h:17,
                         from include/linux/crypto.h:22,
                         from arch/x86/kernel/asm-offsets_32.c:8,
                         from arch/x86/kernel/asm-offsets.c:3:
        include/linux/sysfs.h:201: error: redefinition of 'sysfs_update_group'
        include/linux/sysfs.h:195: error: previous definition of 'sysfs_update_group' was here
        make[1]: *** [arch/x86/kernel/asm-offsets.s] Error 1
        make: *** [prepare0] Error 2
      
      with the following config:
      
          http://redhat.com/~mingo/misc/config-Sun_May__4_07_09_30_CEST_2008.bad
      
      the reason for the build failure is the duplicate definition of the
      sysfs_update_group() inline function in include/linux/sysfs.h.
      
      The duplication was a merge error: it was added via -mm by commit
      v2.6.25-7262-g2850699c, "sysfs: sysfs_update_group stub for
      CONFIG_SYSFS=n" a day before v2.6.26-rc1, but a day before that the same
      commit was already merged upstream via the sysfs tree, with commit
      v2.6.25-7211-g1cbfb7a5.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e73b65f1
    • A
      fix asm-mips/types.h syntax error · 2961b423
      Adrian Bunk 提交于
      This patch fixes the following compile error caused by
      commit 23cf11dd
      (mips: types: use <asm-generic/int-*.h> for the mips architecture):
      
      <--  snip  -->
      
      ...
        CC      kernel/bounds.s
      In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/types.h:12,
                       from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/page-flags.h:8,
                       from /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/bounds.c:9:
      include2/asm/types.h:56:2: error: #endif without #if
      make[2]: *** [kernel/bounds.s] Error 1
      
      <--  snip  -->
      Signed-off-by: NAdrian Bunk <bunk@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Signed-off-by: NH. Peter Anvin <hpa@zytor.com>
      2961b423
    • A
      fix asm-alpha/types.h breakage · 36bbfe2f
      Adrian Bunk 提交于
      This patch fixes the following compile error on alpha caused by
      commit 3726c23d
      (alpha: types: use <asm-generic/int-*.h> for the alpha architecture):
      
      <--  snip  -->
      
      ...
        CC      arch/alpha/kernel/asm-offsets.s
      In file included from include2/asm/topology.h:6,
                       from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/topology.h:34,
                       from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/mmzone.h:683,
                       from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/gfp.h:4,
                       from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/slab.h:12,
                       from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/percpu.h:5,
                       from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/rcupdate.h:39,
                       from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/pid.h:4,
                       from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/sched.h:74,
                       from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:9:
      include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
      include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
      In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:12:
      include2/asm/io.h:94: warning: type defaults to 'int' in declaration of 'dma_addr_t'
      include2/asm/io.h:94: warning: variable 'dma_addr_t' declared 'inline'
      include2/asm/io.h:94: error: expected ',' or ';' before 'isa_page_to_bus'
      make[2]: *** [arch/alpha/kernel/asm-offsets.s] Error 1
      
      <--  snip  -->
      
      Cc: Richard Henderson <rth@twiddle.net>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Signed-off-by: NH. Peter Anvin <hpa@zytor.com>
      36bbfe2f
    • R
      x86: fix up bootparam.h for userspace inclusion · afaafe50
      Rusty Russell 提交于
      commit 8b664aa6 (x86, boot: add linked
      list of struct setup_data) put a new struct in bootparam.h, but didn't
      use the userspace-safe types.
      Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
      Cc: Huang Ying <ying.huang@intel.com>
      Acked-by: NH. Peter Anvin <hpa@zytor.com>
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      afaafe50
  5. 04 5月, 2008 8 次提交
  6. 03 5月, 2008 17 次提交