1. 08 1月, 2009 15 次提交
    • P
      rcu: fix bug in rcutorture system-shutdown code · c9d557c1
      Paul E. McKenney 提交于
      This patch fixes an rcutorture bug found by Eric Sesterhenn that
      resulted in oopses in response to "rmmod rcutorture".  The problem
      was in some new code that attempted to handle the case where a system
      is shut down while rcutorture is still running, for example, when
      rcutorture is built into the kernel so that it cannot be removed.
      The fix causes the rcutorture threads to "park" in an
      schedule_timeout_uninterruptible(MAX_SCHEDULE_TIMEOUT) rather than
      trying to get them to terminate cleanly.  Concurrent shutdown and
      rmmod is illegal.
      
      I believe that this is 2.6.29 material, as it is used in some testing
      setups.
      
      For reference, here are the rcutorture operating modes:
      
      CONFIG_RCU_TORTURE_TEST=m
      
      	This is the normal rcutorture build.  Use "modprobe rcutorture"
      	(with optional arguments) to start, and "rmmod rcutorture" to
      	stop.  If you shut the system down without doing the rmmod, you
      	should see console output like:
      
      	rcutorture thread rcu_torture_writer parking due to system shutdown
      
      	One for each rcutorture kthread.
      
      CONFIG_RCU_TORTURE_TEST=y
      CONFIG_RCU_TORTURE_TEST_RUNNABLE=n
      
      	Use this if you want rcutorture built in, but don't want the
      	test to start running during early boot.  To start the
      	torturing:
      
      		echo 1 > /proc/sys/kernel/rcutorture_runnable
      
      	To stop the torturing, s/1/0/
      
      	You will get "parking" console messages as noted above when
      	you shut the system down.
      
      CONFIG_RCU_TORTURE_TEST=y
      CONFIG_RCU_TORTURE_TEST_RUNNABLE=y
      
      	Same as above, except that the torturing starts during early
      	boot.  Only for the stout of heart and strong of stomach.
      	The same /proc entry noted above may be used to control the
      	test.
      Located-by: NEric Sesterhenn <snakebyte@gmx.de>
      Tested-by: NEric Sesterhenn <snakebyte@gmx.de>
      Signed-off-by: NPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      c9d557c1
    • H
      xtensa: introduce swab.h · 8903709b
      Harvey Harrison 提交于
      Fixes compile breakage as linux/byteorder.h was removed.
      Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8903709b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · daf4b805
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        firewire: reorder struct fw_card for better cache efficiency
        firewire: fix resetting of bus manager retry counter
        firewire: improve refcounting of fw_card
        firewire: typo in comment
        firewire: fix small memory leak at module removal
        firewire: fw-sbp2: remove unnecessary locking
        ieee1934: dv1394: interrupt enabling/disabling broken on big-endian
        ieee1394: dv1394: annotate frame input/output structs as little endian
        ieee1394: eth1394: trivial sparse annotations
        ieee1394: mark bus_info_data as a __be32 array
        ieee1394: replace CSR_SET_BUS_INFO_GENERATION macro
        ieee1394: pcilynx: trivial endian annotation
        ieee1394: ignore nonzero Bus_Info_Block.max_rom, fetch config ROM in quadlets
        ieee1394: consolidate uses of IEEE1934_BUSID_MAGIC
        ieee1394: ohci1394: flush MMIO writes before delay in initialization
        ieee1394: ohci1394: pass error codes from request_irq through
        ieee1394: ohci1394: don't leave interrupts enabled during suspend/resume
        ieee1394: mark all hpsb_address_ops instances as const
        ieee1394: replace a GFP_ATOMIC by GFP_KERNEL allocation
      daf4b805
    • L
      Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc · a0c9f240
      Linus Torvalds 提交于
      * 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
        proc: remove write-only variable in proc_pident_lookup()
        proc: fix sparse warning
        proc: add /proc/*/stack
        proc: remove '##' usage
        proc: remove useless WARN_ONs
        proc: stop using BKL
      a0c9f240
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 · 5bb47b9f
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (171 commits)
        Blackfin arch: fix bug - BF527 0.2 silicon has different CPUID (DSPID) value
        Blackfin arch: Enlarge flash partition for kenel for bf533/bf537 boards
        Blackfin arch: fix bug: kernel crash when enable SDIO host driver
        Blackfin arch: Print FP at level KERN_NOTICE
        Blackfin arch: drop ad73311 test code
        Blackfin arch: update board default configs
        Blackfin arch: Set PB4 as the default irq for bf548 board v1.4+.
        Blackfin arch: fix typo in early printk bit size processing
        Blackfin arch: enable reprogram cclk and sclk for bf518f-ezbrd
        Blackfin arch: add SDIO host driver platform data
        Blackfin arch: fix bug - kernel stops at initial console
        Blackfin arch: fix bug - kernel crash after config IP for ethernet port
        Blackfin arch: add sdh support for bf518f-ezbrd
        Blackfin arch: fix bug - kernel detects BF532 incorrectly
        Blackfin arch: add () to avoid warnings from gcc
        Blackfin arch: change HWTRACE Kconfig and set it on default
        Blackfin arch: Clean oprofile build path for blackfin
        Blackfin arch: remove hardware PM code, oprofile not use it
        Blackfin arch: rewrite get_sclk()/get_vco()
        Blackfin arch: cleanup and unify the ins functions
        ...
      5bb47b9f
    • L
      Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · 2f2408a8
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (29 commits)
        hwmon: Fix various typos
        hwmon: Check for ACPI resource conflicts
        hwmon: (lm70) Add TI TMP121 support
        hwmon: (lm70) Code streamlining and cleanup
        hwmon: Deprecate the fscher and fscpos drivers
        hwmon: (fschmd) Add watchdog support
        hwmon: (fschmd) Cleanups for watchdog support
        hwmon: (i5k_amb) Load automatically on all 5000/5400 chipsets
        hwmon: (it87) Add support for the ITE IT8720F
        hwmon: Don't overuse I2C_CLIENT_MODULE_PARM
        hwmon: Add LTC4245 driver
        hwmon: (f71882fg) Fix fan_to/from_reg prototypes
        hwmon: (f71882fg) Printout fan modes
        hwmon: (f71882fg) Add documentation
        hwmon: (f71882fg) Fix auto_channels_temp temp numbering with f8000
        hwmon: (f71882fg) Add missing pwm3 attr for f71862fg
        hwmon: (f71882fg) Add F8000 support
        hwmon: (f71882fg) Remove the fan_mode module option
        hwmon: (f71882fg) Separate max and crit alarm and beep
        hwmon: (f71882fg) Check for hwmon powerdown state
        ...
      2f2408a8
    • L
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · fa7b906e
      Linus Torvalds 提交于
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        i2c: Use snprintf to set adapter names
        Input: apanel - convert to new i2c binding
        i2c: Drop I2C_CLASS_CAM_DIGITAL
        i2c: Drop I2C_CLASS_CAM_ANALOG and I2C_CLASS_SOUND
        i2c: Drop I2C_CLASS_ALL
        i2c: Get rid of remaining bus_id access
        i2c: Replace bus_id with dev_name(), dev_set_name()
      fa7b906e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 · 08249903
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
        avr32: Move syscalls.h under arch/avr32/include/asm/
        avr32: Define DIE_OOPS
        avr32: Remove DMATEST from defconfigs
        arch/avr32: Eliminate NULL test and memset after alloc_bootmem
        avr32: data param to at32_add_device_mci() must be non-NULL
        atmel-mci: move atmel-mci.h file to include/linux
        avr32: Hammerhead board support
        avr32: Allow reserving multiple pins at once
        favr-32: Remove deprecated call
        MIMC200: Remove deprecated call
        avr: struct device - replace bus_id with dev_name(), dev_set_name()
        avr32: Introducing asm/syscalls.h
      08249903
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes · 0d6326a1
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
        GFS2: Fix typo in gfs_page_mkwrite()
        GFS2: LSF and LBD are now one and the same
        GFS2: Set GFP_NOFS when allocating page on write
      0d6326a1
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 · 52fefcec
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
        xtensa: Update platform files to reflect new location of the header files.
        xtensa: switch to packed struct unaligned access implementation
        xtensa: Add xt2000 support files.
        xtensa: move headers files to arch/xtensa/include
        xtensa: use the new byteorder headers
      52fefcec
    • H
      stop_machine/cpu hotplug: fix disable_nonboot_cpus · a0e280e0
      Heiko Carstens 提交于
      disable_nonboot_cpus calls _cpu_down. But _cpu_down requires that the
      caller already created the stop_machine workqueue (like cpu_down does).
      Otherwise a call to stop_machine will lead to accesses to random memory
      regions.
      
      When introducing this new interface (9ea09af3
      "stop_machine: introduce stop_machine_create/destroy") I missed the second
      call site of _cpu_down.
      So add the missing stop_machine_create/destroy calls to disable_nonboot_cpus
      as well.
      
      Fixes suspend-to-ram/disk and also this bug:
      
      [  286.547348] BUG: unable to handle kernel paging request at 6b6b6b6b
      [  286.548940] IP: [<c0150ca4>] __stop_machine+0x88/0xe3
      [  286.550598] Oops: 0002 [#1] SMP
      [  286.560580] Pid: 3273, comm: halt Not tainted (2.6.28-06127-g238c6d54
      [  286.560580] EIP: is at __stop_machine+0x88/0xe3
      [  286.560580] Process halt (pid: 3273, ti=f1a28000 task=f4530f30
      [  286.560580] Call Trace:
      [  286.560580]  [<c03d04e4>] ? _cpu_down+0x10f/0x234
      [  286.560580]  [<c012a57e>] ? disable_nonboot_cpus+0x58/0xdc
      [  286.560580]  [<c01360c0>] ? kernel_poweroff+0x22/0x39
      [  286.560580]  [<c0136301>] ? sys_reboot+0xde/0x14c
      [  286.560580]  [<c01331b2>] ? complete_signal+0x179/0x191
      [  286.560580]  [<c0133396>] ? send_signal+0x1cc/0x1e1
      [  286.560580]  [<c03de418>] ? _spin_unlock_irqrestore+0x2d/0x3c
      [  286.560580]  [<c0133b65>] ? group_send_signal_info+0x58/0x61
      [  286.560580]  [<c0133b9e>] ? kill_pid_info+0x30/0x3a
      [  286.560580]  [<c0133d49>] ? sys_kill+0x75/0x13a
      [  286.560580]  [<c01a06cb>] ? mntput_no_expire+ox1f/0x101
      [  286.560580]  [<c019b3b3>] ? dput+0x1e/0x105
      [  286.560580]  [<c018ef87>] ?  __fput+0x150/0x158
      [  286.560580]  [<c0157abf>] ? audit_syscall_entry+0x137/0x159
      [  286.560580]  [<c010329f>] ? sysenter_do_call+0x12/0x34
      Reported-and-tested-by: N"Justin P. Mattock" <justinmattock@gmail.com>
      Reviewed-by: NPekka Enberg <penberg@cs.helsinki.fi>
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Tested-by: NIngo Molnar <mingo@elte.hu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a0e280e0
    • A
      touchscreen: Fix build of da9034 · 30aafdba
      Alan Cox 提交于
      Missing an include and thus breaks the x86-64 build.
      Signed-off-by: NAlan Cox <alan@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      30aafdba
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 57c44c5f
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
        trivial: chack -> check typo fix in main Makefile
        trivial: Add a space (and a comma) to a printk in 8250 driver
        trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx
        trivial: Fix misspelling of "firmware" in powerpc Makefile
        trivial: Fix misspelling of "firmware" in usb.c
        trivial: Fix misspelling of "firmware" in qla1280.c
        trivial: Fix misspelling of "firmware" in a100u2w.c
        trivial: Fix misspelling of "firmware" in megaraid.c
        trivial: Fix misspelling of "firmware" in ql4_mbx.c
        trivial: Fix misspelling of "firmware" in acpi_memhotplug.c
        trivial: Fix misspelling of "firmware" in ipw2100.c
        trivial: Fix misspelling of "firmware" in atmel.c
        trivial: Fix misspelled firmware in Kconfig
        trivial: fix an -> a typos in documentation and comments
        trivial: fix then -> than typos in comments and documentation
        trivial: update Jesper Juhl CREDITS entry with new email
        trivial: fix singal -> signal typo
        trivial: Fix incorrect use of "loose" in event.c
        trivial: printk: fix indentation of new_text_line declaration
        trivial: rtc-stk17ta8: fix sparse warning
        ...
      57c44c5f
    • J
      HID: fix hid->hiddev initialization in hiddev_connect() · 76052749
      Jiri Kosina 提交于
      Commit 07903407 ("HID: hiddev cleanup -- handle all error conditions
      properly") by mistake removed proper initialization of hid->hiddev pointer
      in hiddev_connect() in case usb_register_dev() succeeds for the hiddev node.
      Put it properly back in place.
      Reported-and-tested-by: NGabriel C <nix.or.die@googlemail.com>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      76052749
    • D
      linux/types.h: Don't depend on __GNUC__ for __le64/__be64 · 940fbf41
      Detlef Riekenberg 提交于
      The typedefs for __u64 and __s64 where fixed to be available for other
      compiler on May 2 2008 by H.  Peter Anvin (in commit edfa5cfa)
      Acked-by: NH. Peter Anvin <hpa@zytor.com>
      Signed-off-by: NDetlef Riekenberg <wine.dev@web.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      940fbf41
  2. 07 1月, 2009 25 次提交