1. 04 10月, 2006 31 次提交
  2. 03 10月, 2006 9 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 · 6ebfc0e2
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
        sh: Fixup __raw_read_trylock().
        sh: Kill off remaining config.h references.
        sh: Initial gitignore list
        sh: build fixes for defconfigs.
        sh: Kill off more dead headers.
        sh: Set pclk default for SH7705.
        sh: defconfig updates.
      6ebfc0e2
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6 · 1e9abb5b
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
        sh64: Remove me from sh64 maintainers.
        sh64: Update cayman defconfig.
      1e9abb5b
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 65fc4713
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Update defconfig.
        [SPARC64]: Do not include compat.h from asm-sparc64/signal.h any more.
        [SPARC64]: Move signal compat bits to new header file.
      65fc4713
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · ccaa36f7
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (29 commits)
        [POWERPC] Fix rheap alignment problem
        [POWERPC] Use check_legacy_ioport() for ISAPnP
        [POWERPC] Avoid NULL pointer in gpio1_interrupt
        [POWERPC] Enable generic rtc hook for the MPC8349 mITX
        [POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class
        [POWERPC] Create a "wrapper" script and use it in arch/powerpc/boot
        [POWERPC] fix spin lock nesting in hvc_iseries
        [POWERPC] EEH failure to mark pci slot as frozen.
        [POWERPC] update powerpc defconfig files after libata kconfig breakage
        [POWERPC] enable sysrq in pmac32_defconfig
        [POWERPC] UPIO_TSI cleanup
        [POWERPC] rewrite mkprep and mkbugboot in sane C
        [POWERPC] maple/pci iomem annotations
        [POWERPC] powerpc oprofile __user annotations
        [POWERPC] cell spufs iomem annotations
        [POWERPC] NULL noise removal: spufs
        [POWERPC] ppc math-emu needs -fno-builtin-fabs for math.c and fabs.c
        [POWERPC] update mpc8349_itx_defconfig and remove some debug settings
        [POWERPC] Always call cede in pseries dedicated idle loop
        [POWERPC] Fix loop logic in irq_alloc_virt()
        ...
      ccaa36f7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild · b4a9071a
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
        kbuild: trivial documentation fixes
        kconfig: fix saving alternate kconfig file in parent dir
        kbuild: make modpost processing configurable
        kconfig/menuconfig: do not let ncurses clutter screen on exit
        kconfig/lxdialog: clear long menu lines
        kbuild: do not build mconf & lxdialog unless needed
        kconfig/lxdialog: fix make mrproper
        kconfig/lxdialog: support resize
        kconfig/lxdialog: let <ESC><ESC> behave as expected
        kconfig/menuconfig: lxdialog is now built-in
        kconfig/lxdialog: add a new theme bluetitle which is now default
        kconfig/lxdialog: add support for color themes and add blackbg theme
        kconfig/lxdialog: refactor color support
      b4a9071a
    • Z
      [PATCH] pr_debug: check pr_debug() arguments · 8b2a1fd1
      Zach Brown 提交于
      check pr_debug() arguments
      
      When DEBUG isn't defined pr_debug() is defined away as an empty macro.  By
      throwing away the arguments we allow completely incorrect code to build.
      
      Instead let's make it an empty inline which checks arguments and mark it so gcc
      can check the format specification.
      
      This results in a seemingly insignificant code size increase.  A x86-64
      allyesconfig:
      
         text    data     bss     dec     hex filename
      25354768        7191098 4854720 37400586        23ab00a vmlinux.before
      25354945        7191138 4854720 37400803        23ab0e3 vmlinux
      Signed-off-by: NZach Brown <zach.brown@oracle.com>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      8b2a1fd1
    • A
      [PATCH] isdn: more pr_debug() fixes · 3879b6b6
      Andrew Morton 提交于
      drivers/isdn/sc/event.c: In function 'indicate_status':
      drivers/isdn/sc/event.c:49: error: 'events' undeclared (first use in this function)
      drivers/isdn/sc/event.c:49: error: (Each undeclared identifier is reported only once
      drivers/isdn/sc/event.c:49: error: for each function it appears in.)
      drivers/isdn/sc/event.c:49: warning: format '%d' expects type 'int', but argument 4 has type 'ulong'
      
      drivers/isdn/sc/interrupt.c: In function 'interrupt_handler':
      drivers/isdn/sc/interrupt.c:97: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'long unsigned int'
      
      drivers/isdn/sc/timer.c: In function 'check_reset':
      drivers/isdn/sc/timer.c:80: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int'
      Acked-by: NKarsten Keil <kkeil@suse.de>
      Cc: Zach Brown <zach.brown@oracle.com>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      3879b6b6
    • A
      [PATCH] isdn-debug-build-fix · 20f43535
      Andrew Morton 提交于
      When pr_debug() is enabled:
      
      drivers/isdn/sc/command.c: In function 'command':
      drivers/isdn/sc/command.c:107: error: 'commands' undeclared (first use in this function)
      drivers/isdn/sc/command.c:107: error: (Each undeclared identifier is reported only once
      drivers/isdn/sc/command.c:107: error: for each function it appears in.)
      drivers/isdn/sc/command.c:122: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
      drivers/isdn/sc/command.c: In function 'dial':
      drivers/isdn/sc/command.c:199: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'
      drivers/isdn/sc/command.c: In function 'answer':
      drivers/isdn/sc/command.c:221: warning: format '%s' expects type 'char *', but argument 3 has type 'long unsigned int'
      drivers/isdn/sc/command.c: In function 'hangup':
      drivers/isdn/sc/command.c:244: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int'
      drivers/isdn/sc/command.c: In function 'setl2':
      drivers/isdn/sc/command.c:265: error: 'l2protos' undeclared (first use in this function)
      drivers/isdn/sc/command.c: In function 'setl3':
      drivers/isdn/sc/command.c:297: error: 'l3protos' undeclared (first use in this function)
      drivers/isdn/sc/command.c:297: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int'
      drivers/isdn/sc/command.c: In function 'acceptb':
      drivers/isdn/sc/command.c:315: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int'
      drivers/isdn/sc/command.c: In function 'clreaz':
      drivers/isdn/sc/command.c:330: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int'
      drivers/isdn/sc/command.c: In function 'seteaz':
      drivers/isdn/sc/command.c:345: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int'
      
      Cc: Zach Brown <zach.brown@oracle.com>
      Acked-by: NKarsten Keil <kkeil@suse.de>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      20f43535
    • F
      [PATCH] arm build fail: vfpsingle.c · 42d3fb5a
      Frederik Deweerdt 提交于
      It looks like Zach Brown's patch pr_debug-check-pr_debug-arguments
      worked as inteded. That is, it doesn't "allow completely incorrect code
      to build." :).
      
      The arm build fails with the following message:
        CC      arch/arm/vfp/vfpsingle.o
        arch/arm/vfp/vfpsingle.c: In function `__vfp_single_normaliseround':
        arch/arm/vfp/vfpsingle.c:201: error: `func' undeclared (first use in
        this function)
        arch/arm/vfp/vfpsingle.c:201: error: (Each undeclared identifier is
        reported only once
        arch/arm/vfp/vfpsingle.c:201: error: for each function it appears in.)
        make[1]: *** [arch/arm/vfp/vfpsingle.o] Error 1
        make: *** [arch/arm/vfp] Error 2
      
      The following patch fixes the issue by using func only when DEBUG is
      defined.
      Signed-off-by: NFrederik Deweerdt <frederik.deweerdt@gmail.com>
      Cc: Russell King <rmk@arm.linux.org.uk>
      Cc: Zach Brown <zach.brown@oracle.com>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      42d3fb5a