08 Jan, 2009

1 commit

  • * '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
    ...

    Linus Torvalds
     

07 Jan, 2009

3 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (60 commits)
    uio: make uio_info's name and version const
    UIO: Documentation for UIO ioport info handling
    UIO: Pass information about ioports to userspace (V2)
    UIO: uio_pdrv_genirq: allow custom irq_flags
    UIO: use pci_ioremap_bar() in drivers/uio
    arm: struct device - replace bus_id with dev_name(), dev_set_name()
    libata: struct device - replace bus_id with dev_name(), dev_set_name()
    avr: struct device - replace bus_id with dev_name(), dev_set_name()
    block: struct device - replace bus_id with dev_name(), dev_set_name()
    chris: struct device - replace bus_id with dev_name(), dev_set_name()
    dmi: struct device - replace bus_id with dev_name(), dev_set_name()
    gadget: struct device - replace bus_id with dev_name(), dev_set_name()
    gpio: struct device - replace bus_id with dev_name(), dev_set_name()
    gpu: struct device - replace bus_id with dev_name(), dev_set_name()
    hwmon: struct device - replace bus_id with dev_name(), dev_set_name()
    i2o: struct device - replace bus_id with dev_name(), dev_set_name()
    IA64: struct device - replace bus_id with dev_name(), dev_set_name()
    i7300_idle: struct device - replace bus_id with dev_name(), dev_set_name()
    infiniband: struct device - replace bus_id with dev_name(), dev_set_name()
    ISDN: struct device - replace bus_id with dev_name(), dev_set_name()
    ...

    Linus Torvalds
     
  • of_node_put is needed before discarding a value received from
    of_find_node_by_name, eg in error handling code or when the device node is
    no longer used.

    The semantic match that catches the bug is as follows:
    (http://www.emn.fr/x-info/coccinelle/)

    //
    @r exists@
    local idexpression struct device_node *n;
    position p1, p2;
    struct device_node *n1;
    statement S;
    identifier f;
    expression E;
    expression *ptr != NULL;
    @@

    n@p1 = of_find_node_by_name(...)
    ...
    if (!n) S
    ... when != of_node_put(n)
    when != n1 = f(n,...)
    when != E = n
    when any
    when strict
    (
    return \(0\|\|ptr\);
    |
    return@p2 ...;
    |
    of_node_put(n);
    |
    n1 = f(n,...)
    |
    E = n
    )

    @script:python@
    p1 << r.p1;
    p2 << r.p2;
    @@

    print "* file: %s of_find_node_by_name %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
    //

    Signed-off-by: Nicolas Palix
    Signed-off-by: Julia Lawall
    Acked-by: Stephen Rothwell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Nicolas Palix
     
  • Signed-off-by: Kay Sievers
    Signed-off-by: Greg Kroah-Hartman

    Kay Sievers
     

06 Jan, 2009

1 commit


29 Dec, 2008

2 commits

  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (144 commits)
    powerpc/44x: Support 16K/64K base page sizes on 44x
    powerpc: Force memory size to be a multiple of PAGE_SIZE
    powerpc/32: Wire up the trampoline code for kdump
    powerpc/32: Add the ability for a classic ppc kernel to be loaded at 32M
    powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
    powerpc/32: Setup OF properties for kdump
    powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
    powerpc: Prepare xmon_save_regs for use with kdump
    powerpc: Remove default kexec/crash_kernel ops assignments
    powerpc: Make default kexec/crash_kernel ops implicit
    powerpc: Setup OF properties for ppc32 kexec
    powerpc/pseries: Fix cpu hotplug
    powerpc: Fix KVM build on ppc440
    powerpc/cell: add QPACE as a separate Cell platform
    powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
    powerpc/mpc5200: fix error paths in PSC UART probe function
    powerpc/mpc5200: add rts/cts handling in PSC UART driver
    powerpc/mpc5200: Make PSC UART driver update serial errors counters
    powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
    powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
    ...

    Fix trivial conflict in drivers/char/Makefile as per Paul's directions

    Linus Torvalds
     
  • Remove some more cruft from machw.h and drop the #include where it isn't
    needed.

    Signed-off-by: Finn Thain
    Signed-off-by: Geert Uytterhoeven

    Finn Thain
     

21 Dec, 2008

1 commit

  • This splits the mmu_context handling between 32-bit hash based
    processors, 64-bit hash based processors and everybody else. This is
    preliminary work for adding SMP support for BookE processors.

    Signed-off-by: Benjamin Herrenschmidt
    Acked-by: Kumar Gala
    Signed-off-by: Paul Mackerras

    Benjamin Herrenschmidt
     

03 Dec, 2008

1 commit


01 Dec, 2008

1 commit

  • * rackmeter_remove() reference needs devexit_p
    * rackmeter_setup() is calls devinit and is called only from devinit

    Signed-off-by: Al Viro
    Signed-off-by: Linus Torvalds

    Al Viro
     

17 Oct, 2008

1 commit


06 Aug, 2008

1 commit


22 Jul, 2008

1 commit


21 Jul, 2008

1 commit


15 Jul, 2008

2 commits


03 Jul, 2008

1 commit


01 Jul, 2008

2 commits

  • This makes two changes:

    * As noted by Akinobu Mita in patch
    b1fceac2b9e04d278316b2faddf276015fc06e3b, alloc_bootmem never returns NULL
    and always returns a zeroed region of memory. Thus the error checking code
    and memset after the call to alloc_bootmem are not necessary.

    * The old error handling code consisted of setting a global variable to
    NULL and returning an error code, which could cause previously allocated
    resources never to be freed. The patch adds calls to appropriate resource
    deallocation functions.

    Signed-off-by: Julia Lawall
    Signed-off-by: Paul Mackerras

    Julia Lawall
     
  • This contains the following cleanups:
    - make the following needlessly global code static:
    - adb.c: adb_controller
    - adb.c: adb_init()
    - adbhid.c: adb_to_linux_keycodes[] (also make it const)
    - via-pmu68k.c: backlight_level
    - via-pmu68k.c: backlight_enabled
    - remove the following unused code:
    - via-pmu68k.c: sleep_notifier_list

    Signed-off-by: Adrian Bunk
    Acked-by: Geert Uytterhoeven
    Acked-by: Stephen Rothwell
    Signed-off-by: Paul Mackerras

    Adrian Bunk
     

30 Jun, 2008

4 commits


21 Jun, 2008

3 commits


16 Jun, 2008

4 commits

  • This fixes the following build error with CONFIG_BLK_DEV_IDE_PMAC=n:

    ...
    CC drivers/macintosh/mediabay.o
    /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/macintosh/mediabay.c: In function 'check_media_bay':
    /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/macintosh/mediabay.c:428: error: 'struct media_bay_info' has no member named 'cd_index'
    make[3]: *** [drivers/macintosh/mediabay.o] Error 1

    Reported-by: Adrian Bunk
    Signed-off-by: Adrian Bunk
    Signed-off-by: Paul Mackerras

    Adrian Bunk
     
  • of_node_put is needed before discarding a value received from
    of_find_node_by_name, eg in error handling code.

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

    //
    @@
    struct device_node *n;
    struct device_node *n1;
    statement S;
    identifier f;
    expression E;
    constant C;
    @@

    n = of_find_node_by_name(...)
    ...
    if (!n) S
    ... when != of_node_put(n)
    when != n1 = f(n,...)
    when != E = n
    when any
    when strict
    (
    + of_node_put(n);
    return -C;
    |
    of_node_put(n);
    |
    n1 = f(n,...)
    |
    E = n
    |
    return ...;
    )
    //

    Signed-off-by: Julia Lawall
    Acked-by: Stephen Rothwell
    Signed-off-by: Paul Mackerras

    Julia Lawall
     
  • of_node_put is needed before discarding a value received from
    of_find_node_by_type, eg in error handling code.

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

    //
    @@
    struct device_node *n;
    struct device_node *n1;
    struct device_node *n2;
    statement S;
    identifier f1,f2;
    expression E1,E2;
    constant C;
    @@

    n = of_find_node_by_type(...)
    ...
    if (!n) S
    ... when != of_node_put(n)
    when != n1 = f1(n,...)
    when != E1 = n
    when any
    when strict
    (
    + of_node_put(n);
    return -C;
    |
    of_node_put(n);
    |
    n2 = f2(n,...)
    |
    E2 = n
    |
    return ...;
    )
    //

    Signed-off-by: Julia Lawall
    Acked-by: Stephen Rothwell
    Signed-off-by: Paul Mackerras

    Julia Lawall
     
  • Fix bug introduced by:

    commit 2dde7861afa23cd59db83515cb0b810b92b220aa
    Author: Bartlomiej Zolnierkiewicz
    Date: Fri Apr 18 00:46:23 2008 +0200

    ide: rework PowerMac media-bay support (take 2)
    ...

    [ Yeah, I suck. ]

    bay->cd_index shouldn't be changed if IDE devices are not present
    or retry operations won't happen.

    Cc: Benjamin Herrenschmidt
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     

17 May, 2008

2 commits

  • If the adbhid module parameter restore_capslock_events is used,
    pressing the power button may confuse the capslock state. This is
    because the power button release scancode (0xff) is sometimes the same
    as the capslock press/release scancode.

    This fix adds yet another flag to track the state of the power button
    so that it works independently of capslock.

    Signed-off-by: Rodney Lorrimar
    Signed-off-by: Dmitry Torokhov

    Rodney Lorrimar
     
  • If the adbhid module parameter restore_capslock_events is used,
    sometimes capslock will get stuck down after resuming.

    My fix is to remember the capslock state before suspend and then
    ignore the first 'caps lock key down' message after resume if the
    capslock LED was on before suspending.

    Signed-off-by: Rodney Lorrimar
    Signed-off-by: Dmitry Torokhov

    Rodney Lorrimar
     

16 May, 2008

1 commit


15 May, 2008

1 commit


14 May, 2008

1 commit

  • Create /sys/bus/of_platform/devices/*/modalias file to allow autoloading
    of modules. Modalias files are already present for many other bus types.
    This adds also a newline to the devspec files.

    Also create a devspec file for mac-io devices. They were created as a
    side effect. Use correct buffer size for mac-io modalias buffer.

    Tested on iBook1 and Efika.

    Signed-off-by: Olaf Hering
    Signed-off-by: Paul Mackerras

    Olaf Hering
     

05 May, 2008

3 commits


29 Apr, 2008

1 commit

  • This implements a new driver named windfarm_pm121, which drives the
    fans on PowerMac 12,1 machines : iMac G5 iSight (rev C) 17" and
    20". It's based on the windfarm_pm81 driver from Benjamin
    Herrenschmidt.

    This includes fixes from David Woodhouse correcting the names of some
    of the sensors.

    Signed-off-by: Étienne Bersac
    Signed-off-by: David Woodhouse
    Signed-off-by: Benjamin Herrenschmidt
    Signed-off-by: Paul Mackerras

    Étienne Bersac
     

26 Apr, 2008

1 commit