06 Aug, 2008
1 commit
-
Following files don't need at all:
- arch/mips/jazz/setup.c
- arch/sh/boards/mach-systemh/irq.c
- drivers/macintosh/mediabay.c
- drivers/scsi/hptiop.c
- drivers/usb/storage/freecom.c
- arch/powerpc/include/asm/ide.h
- init/main.cCc: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
22 Jul, 2008
1 commit
-
device_create() is race-prone, so use the race-free
device_create_drvdata() instead as device_create() is going away.Cc: Benjamin Herrenschmidt
Signed-off-by: Greg Kroah-Hartman
21 Jul, 2008
1 commit
15 Jul, 2008
2 commits
-
Manual fixup of:
arch/powerpc/Kconfig
03 Jul, 2008
1 commit
-
Signed-off-by: Arnd Bergmann
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 -
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_listSigned-off-by: Adrian Bunk
Acked-by: Geert Uytterhoeven
Acked-by: Stephen Rothwell
Signed-off-by: Paul Mackerras
30 Jun, 2008
4 commits
-
Signed-off-by: Daniel Walker
Signed-off-by: Andrew Morton
Acked-by: Benjamin Herrenschmidt
Signed-off-by: Paul Mackerras -
Signed-off-by: Daniel Walker
Signed-off-by: Andrew Morton
Acked-by: Benjamin Herrenschmidt
Signed-off-by: Paul Mackerras -
Signed-off-by: Stephen Rothwell
Acked-by: Benjamin Herrenschmidt
Signed-off-by: Paul Mackerras
21 Jun, 2008
3 commits
-
Signed-off-by: Arnd Bergmann
-
Signed-off-by: Arnd Bergmann
-
Put explicit lock_kernel() calls in adb_open(). The fact that
adb_release() already has them suggests this is necessary.Signed-off-by: Jonathan Corbet
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 1Reported-by: Adrian Bunk
Signed-off-by: Adrian Bunk
Signed-off-by: Paul Mackerras -
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 -
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 -
Fix bug introduced by:
commit 2dde7861afa23cd59db83515cb0b810b92b220aa
Author: Bartlomiej Zolnierkiewicz
Date: Fri Apr 18 00:46:23 2008 +0200ide: 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
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 -
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
16 May, 2008
1 commit
15 May, 2008
1 commit
-
Signed-off-by: Robert P. J. Day
Acked-by: Benjamin Herrenschmidt
Signed-off-by: Andrew Morton
Signed-off-by: Paul Mackerras
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
05 May, 2008
3 commits
-
Signed-off-by: Daniel Walker
Signed-off-by: Andrew Morton
Acked-by: Benjamin Herrenschmidt
Signed-off-by: Paul Mackerras -
Signed-off-by: Daniel Walker
Signed-off-by: Andrew Morton
Acked-by: Benjamin Herrenschmidt
Signed-off-by: Paul Mackerras -
Signed-off-by: Daniel Walker
Signed-off-by: Andrew Morton
Acked-by: Benjamin Herrenschmidt
Signed-off-by: Paul Mackerras
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
26 Apr, 2008
3 commits
-
Signed-off-by: Harvey Harrison
Signed-off-by: Linus Torvalds -
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (49 commits)
[POWERPC] Add zImage.iseries to arch/powerpc/boot/.gitignore
[POWERPC] bootwrapper: fix build error on virtex405-head.S
[POWERPC] 4xx: Fix 460GT support to not enable FPU
[POWERPC] 4xx: Add NOR FLASH entries to Canyonlands and Glacier dts
[POWERPC] Xilinx: of_serial support for Xilinx uart 16550.
[POWERPC] Xilinx: boot support for Xilinx uart 16550.
[POWERPC] celleb: Add support for PCI Express
[POWERPC] celleb: Move miscellaneous files for Beat
[POWERPC] celleb: Move a file for SPU on Beat
[POWERPC] celleb: Move files for Beat mmu and iommu
[POWERPC] celleb: Move files for Beat hvcall interfaces
[POWERPC] celleb: Move the SCC related code for celleb
[POWERPC] celleb: Move the files for celleb base support
[POWERPC] celleb: Consolidate io-workarounds code
[POWERPC] cell: Generalize io-workarounds code
[POWERPC] Add CONFIG_PPC_PSERIES_DEBUG to enable debugging for platforms/pseries
[POWERPC] Convert from DBG() to pr_debug() in platforms/pseries/
[POWERPC] Register udbg console early on pseries LPAR
[POWERPC] Mark udbg console as CON_ANYTIME, ie. callable early in boot
[POWERPC] Set udbg_console index to 0
... -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
Input: wacom - add support for Cintiq 20WSX
Input: ucb1400_ts - IRQ probe fix
Input: at32psif - update MODULE_AUTHOR with new email
Input: mac_hid - add lockdep annotation to emumousebtn
Input: i8042 - fix incorrect usage of strncpy and strncat
Input: bf54x-keys - add infrastructure for keypad wakeups
Input: add MODULE_ALIAS() to hotpluggable platform modules
Input: drivers/char/keyboard.c - use time_after
Input: fix ordering in joystick Makefile
Input: wm97xx-core - support use as a wakeup source
Input: wm97xx-core - use IRQF_SAMPLE_RANDOM
Input: wm97xx-core - only schedule interrupt handler if not already scheduled
Input: add Zhen Hua driver
Input: aiptek - add support for Genius G-PEN 560 tablet
Input: wacom - implement suspend and autosuspend
Input: xpad - set proper buffer length for outgoing requests
Input: omap-keypad - fix build warning
Input: gpio_keys - irq handling cleanup
Input: add PS/2 serio driver for AVR32 devices
Input: put ledstate in the keyboard notifier
...
25 Apr, 2008
1 commit
-
The mouse button emulation calls input device methods from an input
device. This causes funny lock nesting which is harmless as each
device has its own locks.Give the nesting device its own lock classes so that lockdep will not
consider them the same.Signed-off-by: Peter Zijlstra
Signed-off-by: Dmitry Torokhov
24 Apr, 2008
1 commit
-
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias
is prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable
"macintosh" platform drivers, to re-enable auto loading.[dbrownell@users.sourceforge.net: registration fixes]
Signed-off-by: Kay Sievers
Signed-off-by: David Brownell
Cc: Benjamin Herrenschmidt
Signed-off-by: Andrew Morton
Signed-off-by: Paul Mackerras
19 Apr, 2008
1 commit
-
Signed-off-by: Matthew Wilcox
18 Apr, 2008
1 commit
-
Rework PowerMac media-bay support in such way that instead of
un/registering the IDE interface we un/register IDE devices:* Add ide_port_scan() helper for probing+registerering devices on a port.
* Rename ide_port_unregister_devices() to __ide_port_unregister_devices().
* Add ide_port_unregister_devices() helper for unregistering devices on a port.
* Add 'ide_hwif_t *cd_port' to 'struct media_bay_info', pass 'hwif' instead
of hwif->index to media_bay_set_ide_infos() and use it to setup 'cd_port'.* Use ide_port_unregister_devices() instead of ide_unregister()
and ide_port_scan() instead of ide_register_hw() in media_bay_step().* Unexport ide_register_hw() and make it static.
v2:
* Fix build by adding include to .
(Reported by Michael/Kamalesh/Andrew).Cc: Kamalesh Babulal
Cc: Michael Ellerman
Cc: Andrew Morton
Signed-off-by: Bartlomiej Zolnierkiewicz
13 Mar, 2008
2 commits
-
Currently, if drivers/macintosh/apm_emu is a module and the config
doesn't have CONFIG_SUSPEND we get:ERROR: "pmu_batteries" [drivers/macintosh/apm_emu.ko] undefined!
ERROR: "pmu_battery_count" [drivers/macintosh/apm_emu.ko] undefined!
ERROR: "pmu_power_flags" [drivers/macintosh/apm_emu.ko] undefined!on PPC32. The variables aren't wrapped in '#if defined(CONFIG_SUSPEND)'
so we probably shouldn't wrap the exports either. This removes the
CONFIG_SUSPEND part of the export, which fixes compilation on ppc32.Signed-off-by: Guido Guenther
Signed-off-by: Paul Mackerras -
The PMU backlight code would kick in during sleep/resume even on
machines that use a different backlight method. This breaks
sleep on some PowerBooks.This fixes it by adding a flag to indicate whether the backlight
is controlled by the PMU, and testing that before trying to use
the PMU to turn off the backlight during sleep.Signed-off-by: Benjamin Herrenschmidt
Signed-off-by: Paul Mackerras
24 Feb, 2008
1 commit
-
During the last step of hibernation in the "platform" mode (with the
help of ACPI) we use the suspend code, including the devices'
->suspend() methods, to prepare the system for entering the ACPI S4
system sleep state.But at least for some devices the operations performed by the
->suspend() callback in that case must be different from its operations
during regular suspend.For this reason, introduce the new PM event type PM_EVENT_HIBERNATE and
pass it to the device drivers' ->suspend() methods during the last phase
of hibernation, so that they can distinguish this case and handle it as
appropriate. Modify the drivers that handle PM_EVENT_SUSPEND in a
special way and need to handle PM_EVENT_HIBERNATE in the same way.These changes are necessary to fix a hibernation regression related
to the i915 driver (ref. http://lkml.org/lkml/2008/2/22/488).Signed-off-by: Rafael J. Wysocki
Acked-by: Pavel Machek
Tested-by: Jeff Chua
Signed-off-by: Linus Torvalds
15 Feb, 2008
1 commit
-
The current pmac32_defconfig fails to build with the following error:
Building modules, stage 2.
ERROR: "check_media_bay" [drivers/block/swim3.ko] undefined!
WARNING: modpost: Found 23 section mismatch(es).
To see full details build your kernel with:
'make CONFIG_DEBUG_SECTION_MISMATCH=y'
make[2]: *** [__modpost] Error 1This patch fixes that.
Signed-off-by: Tony Breeds
Acked-by: Benjamin Herrenschmidt
Cc: Paul Mackerras
Acked-by: Bartlomiej Zolnierkiewicz
Cc: Josh Boyer
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
08 Feb, 2008
1 commit
-
It appears that with the U3 northbridge, if the processor is in NAP
mode the whole time while waiting for an SMU command to complete,
then the SMU will fail. It could be related to the weird backward
mechanism the SMU uses to get to system memory via i2c to the
northbridge that doesn't operate properly when the said bridge is
in napping along with the CPU. That is on U3 at least, U4 doesn't
seem to be affected.This didn't show before NO_HZ as the timer wakeup was enough to make
it work it seems, but that is no longer the case.This fixes it by disabling NAP mode on those machines while
an SMU command is in flight.Signed-off-by: Benjamin Herrenschmidt
Signed-off-by: Paul Mackerras