17 Oct, 2008

8 commits

  • It is written in the Documentation/sysrq.txt that oom-killer is enabled
    when we set "64" in /proc/sys/kernel/sysrq:

    Here is the list of possible values in /proc/sys/kernel/sysrq:
    64 - enable signalling of processes (term, kill, oom-kill)
    ^^^^^^^^

    but enable_mask is not set in sysrq_moom_op.

    Signed-off-by: Naohiro Ooiwa
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Naohiro Ooiwa
     
  • Using "def_bool n" is pointless, simply using bool here appears more
    appropriate.

    Further, retaining such options that don't have a prompt and aren't
    selected by anything seems also at least questionable.

    Signed-off-by: Jan Beulich
    Cc: Ingo Molnar
    Cc: Tony Luck
    Cc: Thomas Gleixner
    Cc: Bartlomiej Zolnierkiewicz
    Cc: Sam Ravnborg
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jan Beulich
     
  • Use the '%pF' format to get rid of an "#ifdef DEBUG" and make some printks
    atomic.

    This removes the last in-tree uses of print_fn_descriptor_symbol(). I
    marked print_fn_descriptor_symbol() deprecated and scheduled it for
    removal next year to give time for out-of-tree modules to be updated.

    parisc's print_fn_descriptor_symbol() is currently broken there (it needs
    to dereference the function pointer similar to ia64 and power). This
    patch shouldn't make anything worse, but it means we need to fix
    dereference_function_descriptor() instead of print_fn_descriptor_symbol()
    to get meaningful initcall_debug output.

    Signed-off-by: Bjorn Helgaas
    Cc: Jesse Barnes
    Cc: Kyle McMartin
    Cc: "Rafael J. Wysocki"
    Cc: Kay Sievers
    Cc: Greg KH
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Bjorn Helgaas
     
  • It seems this is the right way around because otherwise the len usage in
    the outer loop would be pretty pointless.

    Signed-off-by: Ilpo Järvinen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ilpo Järvinen
     
  • EEEPC_LAPTOP uses RFKILL, so the former should depend on RFKILL.
    Build errors happen when EEEPC_LAPTOP=y and RFKILL=m.

    eeepc-laptop.c:(.text+0xd5a7b): undefined reference to `rfkill_allocate'
    eeepc-laptop.c:(.text+0xd5b04): undefined reference to `rfkill_register'
    eeepc-laptop.c:(.text+0xd5b48): undefined reference to `rfkill_allocate'
    eeepc-laptop.c:(.text+0xd5bd4): undefined reference to `rfkill_register'
    eeepc-laptop.c:(.text+0xd5ece): undefined reference to `rfkill_unregister'
    eeepc-laptop.c:(.text+0xd5ef6): undefined reference to `rfkill_unregister'
    make[1]: *** [.tmp_vmlinux1] Error 1

    Signed-off-by: Randy Dunlap
    Cc: Corentin Chary
    Cc: Matthew Garrett
    Cc: Henrique de Moraes Holschuh
    Cc: Karol Kozimor
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     
  • The kernel.h macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /
    (d)) but is perhaps more readable.

    An extract of the semantic patch that makes this change is as follows:
    (http://www.emn.fr/x-info/coccinelle/)

    //
    @haskernel@
    @@

    #include

    @depends on haskernel@
    expression n,d;
    @@

    (
    - (n + d - 1) / d
    + DIV_ROUND_UP(n,d)
    |
    - (n + (d - 1)) / d
    + DIV_ROUND_UP(n,d)
    )

    @depends on haskernel@
    expression n,d;
    @@

    - DIV_ROUND_UP((n),d)
    + DIV_ROUND_UP(n,d)

    @depends on haskernel@
    expression n,d;
    @@

    - DIV_ROUND_UP(n,(d))
    + DIV_ROUND_UP(n,d)
    //

    Signed-off-by: Julia Lawall
    Cc: Jack Steiner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Julia Lawall
     
  • __FUNCTION__ is gcc-specific, use __func__

    Signed-off-by: Harvey Harrison
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Harvey Harrison
     
  • Signed-off-by: Harvey Harrison
    Acked-by: Andres Salomon
    Cc: David Woodhouse
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Harvey Harrison
     

16 Oct, 2008

3 commits

  • * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
    MIPS: Kill unused inclusions
    MIPS: IP32: Add platform device for CMOS RTC; remove dead code
    RTC: M48T35: new RTC driver
    MIPS: IP27: Switch over to RTC class driver
    MIPS: DS1286: New RTC driver
    MIPS: IP22/28: Switch over to RTC class driver
    MIPS: PCI: Scan busses when they are registered
    MIPS: WGT634U: Add reset button support
    MIPS: BCM47xx: Use the new SSB GPIO API
    MIPS: BCM47xx: Remove references to BCM947XX
    MIPS: WGT634U: Add machine detection message
    MIPS: Align .data.cacheline_aligned based on CONFIG_MIPS_L1_CACHE_SHIFT
    MIPS: show_cpuinfo prints the type of the calling CPU
    MIPS: Fix wrong branch target in new spin_lock code.
    MIPS: Have a heart for a lonely, lost header file ...

    Linus Torvalds
     
  • proc_clear_tty() gets called with interrupts off (while holding the task list
    lock) from sys_setid. This means that it needs the _irqsave version of the
    locking primitives.

    Reported-by: Marcin Slusarz
    Tested-by: Marcin Slusarz
    Signed-off-by: Arjan van de Ven
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Arjan van de Ven
     
  • The metronome driver produces warnings when built on x86-64 as it assumes that
    size_t is an int. Use %Zd instead.

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     

15 Oct, 2008

29 commits

  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (158 commits)
    powerpc: Fix CHRP PCI config access for indirect_pci
    powerpc/chrp: Fix detection of Python PCI host bridge on IBM CHRPs
    powerpc: Fix 32-bit SMP boot on CHRP
    powerpc: Fix link errors on 32-bit machines using legacy DMA
    powerpc/pci: Improve detection of unassigned bridge resources
    hvc_console: Fix free_irq in spinlocked section
    powerpc: Get USE_STRICT_MM_TYPECHECKS working again
    powerpc: Reflect the used arguments in machine_init() prototype
    powerpc: Fix DMA offset for non-coherent DMA
    powerpc: fix fsl_upm nand driver modular build
    powerpc/83xx: add NAND support for the MPC8360E-RDK boards
    powerpc: FPGA support for GE Fanuc SBC610
    i2c: MPC8349E-mITX Power Management and GPIO expander driver
    powerpc: reserve two DMA channels for audio in MPC8610 HPCD device tree
    powerpc: document the "fsl,ssi-dma-channel" compatible property
    powerpc: disable CHRP and PMAC support in various defconfigs
    OF: add fsl,mcu-mpc8349emitx to the exception list
    powerpc/83xx: add DS1374 RTC support for the MPC837xE-MDS boards
    powerpc: remove support for bootmem-allocated memory for the DIU driver
    powerpc: remove non-dependent load fsl_booke PTE_64BIT
    ...

    Linus Torvalds
     
  • This driver replaces the broken ip27-rtc driver in drivers/char and
    gives back RTC support for SGI IP27 machines.

    Signed-off-by: Thomas Bogendoerfer
    Acked-by: Alessandro Zummo
    Signed-off-by: Ralf Baechle

    Thomas Bogendoerfer
     
  • This driver replaces the broken DS1286 driver in drivers/char and gives back
    RTC support for SGI IP22 and IP28 machines.

    Signed-off-by: Thomas Bogendoerfer
    Acked-by: Alessandro Zummo
    Signed-off-by: Ralf Baechle

    Thomas Bogendoerfer
     
  • Manual fixup of conflicts on:

    arch/powerpc/include/asm/dcr-regs.h
    drivers/net/ibm_newemac/core.h

    Benjamin Herrenschmidt
     
  • * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
    i2c-viapro: Add support for SMBus Process Call transactions
    i2c: Restore i2c_smbus_process_call function
    i2c: Do earlier driver model init
    i2c: Only build Tyan SMBus mux drivers on x86
    i2c: Guard against oopses from bad init sequences
    i2c: Document the implementation details of the /dev interface
    i2c: Improve dev-interface documentation
    i2c-parport-light: Don't register a platform device resource
    hwmon: (dme1737) Convert to a new-style i2c driver
    hwmon: (dme1737) Be less i2c-centric
    i2c/tps65010: Vibrator hookup to gpiolib
    i2c-viapro: Add VX800/VX820 support
    i2c: Renesas Highlander FPGA SMBus support
    i2c-pca-isa: Don't grab arbitrary resources
    i2c/isp1301_omap: Convert to a new-style i2c driver, part 2
    i2c/isp1301_omap: Convert to a new-style i2c driver, part 1

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (55 commits)
    HID: build drivers for all quirky devices by default
    HID: add missing blacklist entry for Apple ATV ircontrol
    HID: add support for Bright ABNT2 brazilian device
    HID: Don't let Avermedia Radio FM800 be handled by usb hid drivers
    HID: fix numlock led on Dell device 0x413c/0x2105
    HID: remove warn() macro from usb hid drivers
    HID: remove info() macro from usb HID drivers
    HID: add appletv IR receiver quirk
    HID: fix a lockup regression when using force feedback on a PID device
    HID: hiddev.h: Fix example code.
    HID: hiddev.h: Fix mixed space and tabs in example code.
    HID: convert to dev_* prints
    HID: remove hid-ff
    HID: move zeroplus FF processing
    HID: move thrustmaster FF processing
    HID: move pantherlord FF processing
    HID: fix incorrent length condition in hidraw_write()
    HID: fix ttyhid deadlock
    HID: ignore iBuddy devices
    HID: report descriptor fix for remaining MacBook JIS keyboards
    ...

    Linus Torvalds
     
  • We shouldn't rely on "pnp_platform_devices" to tell us whether there
    is a PNP RTC device.

    I introduced "pnp_platform_devices", but I think it was a mistake.
    All it tells us is whether we found any PNPBIOS or PNPACPI devices.
    Many machines have some PNP devices, but do not describe the RTC
    via PNP. On those machines, we need to do the platform driver probe
    to find the RTC.

    We should just register the PNP driver and see whether it claims anything.
    If we don't find a PNP RTC, fall back to the platform driver probe.

    This (in conjunction with the arch/x86/kernel/rtc.c patch to add
    a platform RTC device when PNP doesn't have one) should resolve
    these issues:

    http://bugzilla.kernel.org/show_bug.cgi?id=11580
    https://bugzilla.redhat.com/show_bug.cgi?id=451188

    Signed-off-by: Bjorn Helgaas
    Acked-by: Rafael J. Wysocki
    Acked-by: David Brownell
    Reported-by: Rik Theys
    Reported-by: shr_msn@yahoo.com.tw
    Signed-off-by: Linus Torvalds

    Bjorn Helgaas
     
  • commit 611e097d7707741a336a0677d9d69bec40f29f3d
    Author: Christian Borntraeger
    hvc_console: rework setup to replace irq functions with callbacks
    introduced a spinlock recursion problem. The notifier_del is
    called with a lock held, and in turns calls free_irq which then
    complains when manipulating procfs. This fixes it by moving the
    call to the notifier to outside of the locked section.

    Signed-off-by: Christian Borntraeger
    Signed-off-by: Benjamin Herrenschmidt

    Christian Borntraeger
     
  • Move rtc_wake_setup() from drivers/acpi/glue.c into the RTC driver
    in drivers/rtc/rtc-cmos.c.

    This removes the ordering constraint between the module_init(acpi_rtc_init)
    and the cmos_do_probe() code that depends on it.

    Signed-off-by: Bjorn Helgaas
    Acked-by: Rafael J. Wysocki
    Signed-off-by: Linus Torvalds

    Bjorn Helgaas
     
  • Once kernel configuration has CONFIG_HID turned on, let also all the
    specialized drivers for quirky devices to be built (unless CONFIG_EMBEDDED is
    specified), as usually users don't care that much which driver
    gives them the functionality, but when they want generic support, they
    probably want to have support for all the quirky devices as well.

    Signed-off-by: Jiri Kosina

    Jiri Kosina
     
  • This device is already handled by hid-apple driver, but the blacklist entry
    was missing in generic driver.

    Reported-by: Jiri Slaby
    Signed-off-by: Jiri Kosina

    Jiri Kosina
     
  • This keyboard needs to reset the LEDS during probe.

    Signed-off-by: Mauro Carvalho Chehab
    Signed-off-by: Jiri Kosina

    Mauro Carvalho Chehab
     
  • Based on an original patch from Alexey Klimov ,
    against kernel version 2.6.27.

    This device is already handled by radio-mr800 driver, and we therefore
    want usbhid not to touch it.

    Signed-off-by: Mauro Carvalho Chehab
    Signed-off-by: Jiri Kosina

    Mauro Carvalho Chehab
     
  • This keyboard needs to re-sync numlock after probing.

    Signed-off-by: Mauro Carvalho Chehab
    Signed-off-by: Jiri Kosina

    Mauro Carvalho Chehab
     
  • USB should not be having it's own printk macros, so remove warn() and
    use the system-wide standard of dev_warn() wherever possible. In the
    few places that will not work out, use a basic printk().

    Signed-off-by: Greg Kroah-Hartman
    Signed-off-by: Jiri Kosina

    From: Greg Kroah-Hartman
     
  • USB should not be having it's own printk macros, so remove info() and
    use the system-wide standard of dev_info() wherever possible.

    Signed-off-by: Greg Kroah-Hartman
    Signed-off-by: Jiri Kosina

    Greg Kroah-Hartman
     
  • Similar to the existing IRCONTROL4 handling

    Signed-off-by: Peter Korsgaard
    Signed-off-by: Jiri Kosina

    Peter Korsgaard
     
  • Commit 8006479c9b75fb6594a7b746af3d7f1fbb68f18f introduced a spinlock in
    input_dev->event_lock, which is locked when handling input events.
    However, the hid-pidff driver sleeps when handling events as it waits for
    reports being sent to the device before changing the report contents
    again.
    This causes a system lockup when trying to use force feedback with a PID
    device, a regression introduced in 2.6.24 and 2.6.23.15.

    Fix it by extracting the raw report data from struct hid_report
    immediately when hid_submit_report() is called, therefore allowing
    drivers to change the contents of struct hid_report immediately without
    affecting the already-queued transfer.

    In hid-pidff, re-add the removed usbhid_wait_io() to
    pidff_erase_effect() instead, to prevent a full report queue from causing
    the submission to fail, thus not freeing up device memory.
    pidff_erase_effect() is not called while dev->event_lock is held.

    Signed-off-by: Anssi Hannula
    Signed-off-by: Jiri Kosina

    Anssi Hannula
     
  • Since we have a real device bound to a driver, we may use struct
    device for printing. Use dev_* functions instead of printks in
    4 drivers.

    Signed-off-by: Jiri Slaby
    Signed-off-by: Jiri Kosina

    Jiri Slaby
     
  • hid-ff.c now calls only pidff (generic driver), the special ones are now
    in separate drivers. Invoke pidff on all non-special directly.

    Signed-off-by: Jiri Slaby
    Signed-off-by: Jiri Kosina

    Jiri Slaby
     
  • Signed-off-by: Jiri Slaby
    Signed-off-by: Jiri Kosina

    Jiri Slaby
     
  • Signed-off-by: Jiri Slaby
    Signed-off-by: Jiri Kosina

    Jiri Slaby
     
  • Move the force feedback processing into a separate module.

    [jkosina@suse.cz: fix Kconfig texts a little bit]

    Signed-off-by: Jiri Slaby
    Signed-off-by: Jiri Kosina

    Jiri Slaby
     
  • The bound check on the buffer length

    if (count > HID_MIN_BUFFER_SIZE)

    is of course incorrent, the proper check is

    if (count > HID_MAX_BUFFER_SIZE)

    Fix it.

    Reported-by: Jerry Ryle
    Signed-off-by: Jiri Kosina

    Jiri Kosina
     
  • hid_compat_load() runs on the default workqueue, it request_module(), it
    execs modprobe, it exits, tty flushes default workqueue, it hangs, because
    we are still in it.

    Signed-off-by: Jiri Slaby
    Tested-by:
    Signed-off-by: Andrew Morton
    Signed-off-by: Jiri Kosina

    Jiri Slaby
     
  • iBuddy devices claim to be HID devices, but they are not.
    Add them to the blacklist.

    Signed-off-by: Remi Cattiau
    Signed-off-by: Jiri Kosina

    Remi Cattiau
     
  • This patch fixes a problem that MacBook JIS keyboard sends wrong report
    descriptors. Although it has already been fixed in the first Core 2 Duo model,
    it still remains in other models of MacBook.

    Signed-off-by: Tomoya Adachi
    Signed-off-by: Jiri Kosina

    Tomoya Adachi
     
  • Fix config symbol name in ifdef to fix build error:

    ERROR: "hid_compat_gyration" [drivers/hid/hid-dummy.ko] undefined!

    Signed-off-by: Randy Dunlap
    Acked-by: Jiri Slaby
    Signed-off-by: Jiri Kosina

    Randy Dunlap
     
  • Current kernel has no support for autocentering for Logitech wheels. By
    default autocentering enabled in wheel and constant effect does not work
    properly. Using USB sniffer I found command which change autocentering
    settings: 0xFE, 0x0D, 0x0R, 0x0L, 0x80, 0x00, 0x00, where R - clockwise force,
    L - counter-clockwise (0x0-0xF, 0xC = 100%).

    Signed-off-by: Sergey Belyashov
    Signed-off-by: Jiri Kosina

    Sergey Belyashov