1. 30 6月, 2008 1 次提交
    • J
      [CRIS] Build fixes for compressed and rescue images for v10 and v32: · bdb144b6
      Jesper Nilsson 提交于
      - Use the normal cross gcc instead of using an elf specific cris toolchain.
        This removes the dependency of this second toolchain.
      
      - Use the normal cross objcopy instead of overriding it to use elf-toolchain.
        This allows compiling using "CROSS_COMPILE=$CRIS_GCC/cris-axis-linux-gnu-"
        instead of just "CROSS_COMPILE=$CRIS_GCC/cris-axis-linux-gnu/bin/"
      
      - Remove redundant rules for compiling, the implicit rules are sufficient.
      
      - Convert the arch/cris/arch-v10/boot/compressed/head.S to format
        accepted by the cris-axis-linux-gnu-gcc (registers must be prefixed
        with '$', remove explicit underscore on exported symbols)
      
      - Remove a number of unused (and duplicated) prototypes from
        arch/cris/arch-v10/boot/compressed/misc.c.
      
      - Correct memcpy and memset return values (actually return them!)
      Signed-off-by: NJesper Nilsson <jesper.nilsson@axis.com>
      bdb144b6
  2. 05 3月, 2008 3 次提交
    • J
      cris: correct usage of __user for copy to and from user space in lib/usercopy and uaccess.h · 07f2402b
      Jesper Nilsson 提交于
      Function __copy_user_zeroing in arch/lib/usercopy.c had the wrong parameter
      set as __user, and in include/asm-cris/uaccess.h, it was not set at all for
      some of the calling functions.
      
      This will cut the number of warnings quite dramatically when using sparse.
      
      While we're here, remove useless CVS log and correct confusing typo.
      Signed-off-by: NJesper Nilsson <jesper.nilsson@axis.com>
      Cc: Mikael Starvik <mikael.starvik@axis.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      07f2402b
    • J
      CRIS: Import string.c (memcpy) from newlib: fixes compile error with gcc 4 · 9fe3fd03
      Jesper Nilsson 提交于
      Adrian Bunk reported another compile error with a SVN head GCC:
      
      ...
        CC      arch/cris/arch-v10/lib/string.o
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/string.c:138:
      error: lvalue required as increment operand
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/string.c:138:
      error: lvalue required as increment operand
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/string.c:139:
      error: lvalue required as increment operand
      ...
      
      This is due to the use of the construct:
      
      	*((long*)dst)++ = lc;
      
      Which isn't legal since casts don't return an lvalue.
      
      The solution is to import the implementation from newlib,
      which is continually autotested together with GCC mainline,
      and uses the construct:
      
      	*(long *) dst = lc; dst += 4;
      
      Since this is an import of a file from newlib, I'm not touching
      the formatting or correcting any checkpatch errors.
      
      As for the earlier fix for memset.c, even if the two files for
      CRIS v10 and CRIS v32 are identical at the moment, it might
      be possible to tweak the CRIS v32 version.
      Thus, I'm not yet folding them into the same file, at least not
      until we've done some research on it.
      Signed-off-by: NJesper Nilsson <jesper.nilsson@axis.com>
      Cc: Mikael Starvik <starvik@axis.com>
      Cc: Adrian Bunk <bunk@stusta.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9fe3fd03
    • J
      CRIS v10: Include mm.h instead of vmstat.h in kernel/time.c · a1056873
      Jesper Nilsson 提交于
      Commit 2f569afd
      (CONFIG_HIGHPTE vs. sub-page page tables) introduced use of
      inc_zone_page_state and dec_zone_page_state in include/linux/mm.h.
      
      Those are defined in include/linux/vmstat.h, but after it includes
      mm.h, making it impossible to include vmstat.h since inc_zone_page_state
      and dec_zone_page_state then would be undefined.
      
      arch/cris/arch-v10/kernel/time.c does just this, which makes the
      CRIS v10 build break with the following error:
      
      ...
        CC      arch/cris/arch-v10/kernel/time.o
      In file included from include/linux/vmstat.h:7,
                       from arch/cris/arch-v10/kernel/time.c:17:
      include/linux/mm.h: In function 'pgtable_page_ctor':
      include/linux/mm.h:902: error: implicit declaration of function 'inc_zone_page_state'
      include/linux/mm.h: In function 'pgtable_page_dtor':
      include/linux/mm.h:908: error: implicit declaration of function 'dec_zone_page_state'
      make[2]: *** [arch/cris/arch-v10/kernel/time.o] Error 1
      make[1]: *** [arch/cris/arch-v10/kernel] Error 2
      make: *** [sub-make] Error 2
      ...
      
      By changing kernel/time.c to include linux/mm.h, the build succeeds.
      Signed-off-by: NJesper Nilsson <jesper.nilsson@axis.com>
      Cc: Mikael Starvik <mikael.starvik@axis.com>
      Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a1056873
  3. 15 2月, 2008 1 次提交
    • J
      cris: import memset.c from newlib: fixes compile error with newer (pre4.3) gcc · 77a746ce
      Jesper Nilsson 提交于
      Adrian Bunk reported the following compile error with a SVN head GCC:
      
      ...
      CC arch/cris/arch-v10/lib/memset.o
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c: In function 'memset':
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:164: error: lvalue required as increment operand
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:165: error: lvalue required as increment operand
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:166: error: lvalue required as increment operand
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:167: error: lvalue required as increment operand
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:185: error: lvalue required as increment operand
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:189: error: lvalue required as increment operand
      /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/cris/arch-v10/lib/memset.c:192: error: lvalue required as increment operand
      ... etc ...
      
      This is due to the use of the construct:
      
      	*((long*)dst)++ = lc;
      
      Which is no longer legal since casts don't return an lvalue.
      
      The solution is to import the implementation from newlib,
      which is continually autotested together with GCC mainline,
      and uses the construct:
      
      	*(long *) dst = lc; dst += 4;
      
      With this change, the generated code actually shrinks 76 bytes
      since gcc notices that it can use autoincrement for the move
      instruction in CRIS.
      
         text    data     bss     dec     hex filename
          304       0       0     304     130 memset.old.o
         text    data     bss     dec     hex filename
          228       0       0     228      e4 memset.o
      
      Since this is an import of a file from newlib, I'm not touching
      the formatting or correcting any checkpatch errors.
      
      Note also that even if the two files for the CRIS v10 and CRIS v32
      are identical at the moment, it might be possible to tweak the
      CRIS v32 version. Thus, I'm not yet folding them into the same file,
      at least not until we've done some research on it.
      Signed-off-by: NJesper Nilsson <jesper.nilsson@axis.com>
      Cc: Mikael Starvik <mikael.starvik@axis.com>
      Cc: Adrian Bunk <bunk@stusta.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      77a746ce
  4. 08 2月, 2008 35 次提交