1. 03 4月, 2012 3 次提交
    • P
      blackfin: fix cmpxchg build fails from system.h fallout · 1512cdc3
      Paul Gortmaker 提交于
      Commit 3bed8d67 ("Disintegrate asm/system.h for Blackfin [ver #2]")
      introduced arch/blackfin/include/asm/cmpxchg.h but has it also including
      the asm-generic one which causes this:
      
        CC      arch/blackfin/kernel/asm-offsets.s
        In file included from arch/blackfin/include/asm/cmpxchg.h:125:0,
                       from arch/blackfin/include/asm/atomic.h:10,
                       from include/linux/atomic.h:4,
                       from include/linux/spinlock.h:384,
                       from include/linux/seqlock.h:29,
                       from include/linux/time.h:8,
                       from include/linux/timex.h:56,
                       from include/linux/sched.h:57,
                       from arch/blackfin/kernel/asm-offsets.c:10:
        include/asm-generic/cmpxchg.h:24:15: error: redefinition of '__xchg'
        arch/blackfin/include/asm/cmpxchg.h:82:29: note: previous definition of '__xchg' was here
        make[2]: *** [arch/blackfin/kernel/asm-offsets.s] Error 1
      
      It really only needs two simple defines from asm-generic, so just use
      those instead.
      
      Cc: Bob Liu <lliubbo@gmail.com>
      Cc: Mike Frysinger <vapier@gentoo.org>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Acked-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1512cdc3
    • P
      avr32: fix build failures from mis-naming of atmel_nand.h · 3d92e051
      Paul Gortmaker 提交于
      Commit bf4289cb ("ATMEL: fix nand ecc support") indicated that it
      wanted to "Move platform data to a common header
      include/linux/platform_data/atmel_nand.h" and the new header even had
      re-include protectors with:
      
          #ifndef __ATMEL_NAND_H__
      
      However, the file that was added was simply called atmel.h
      and this caused avr32 defconfig to fail with:
      
        In file included from arch/avr32/boards/atstk1000/setup.c:22:
        arch/avr32/mach-at32ap/include/mach/board.h:10:44: error: linux/platform_data/atmel_nand.h: No such file or directory
        In file included from arch/avr32/boards/atstk1000/setup.c:22:
        arch/avr32/mach-at32ap/include/mach/board.h:121: warning: 'struct atmel_nand_data' declared inside parameter list
        arch/avr32/mach-at32ap/include/mach/board.h:121: warning: its scope is only this definition or declaration, which is probably not what you want
        make[2]: *** [arch/avr32/boards/atstk1000/setup.o] Error 1
      
      It seems the scope of the file contents will expand beyond
      just nand, so ignore the original intention, and fix up the
      users who reference the bad name with the _nand suffix.
      
      CC: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
      CC: David Woodhouse <dwmw2@infradead.org>
      Acked-by: NHans-Christian Egtvedt <egtvedt@samfundet.no>
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3d92e051
    • P
      ARM: mach-msm: fix compile fail from system.h fallout · b443caf1
      Paul Gortmaker 提交于
      To fix:
      
        In file included from arm/boot/compressed/misc.c:28:0:
        arm/mach-msm/include/mach/uncompress.h: In function 'putc':
        arch/arm/mach-msm/include/mach/uncompress.h:48:3: error: implicit
        declaration of function 'smp_mb' [-Werror=implicit-function-declaration]
      
      The putc does a cpu_relax which for this platform is smp_mb.
      
      Bisect indicates the 1st failing commit as: 0195c002 ("Merge tag
      'split-asm_system_h...")
      Signed-off-by: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Acked-by: NDavid Howells <dhowells@redhat.com>
      Acked-by: NDavid Brown <davidb@codeaurora.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b443caf1
  2. 01 4月, 2012 1 次提交
  3. 31 3月, 2012 4 次提交
  4. 30 3月, 2012 13 次提交
  5. 29 3月, 2012 19 次提交