19 Mar, 2010
7 commits
-
Fix kernel-doc warning in firmware_class.c:
Warning(drivers/base/firmware_class.c:94): No description found for parameter 'attr'
Signed-off-by: Randy Dunlap
Signed-off-by: Greg Kroah-Hartman -
This patch updates the kernel-doc notation for early
platform functions.Signed-off-by: Magnus Damm
Acked-by: Randy Dunlap
Signed-off-by: Greg Kroah-Hartman -
This fixes a sysfs lockdep warning in the mlx4 code.
Cc: Yinghai Lu
Cc: Eric Biederman
Signed-off-by: Greg Kroah-Hartman -
This fixes a sysfs lockdep warning in the infiniband code.
Cc: Yinghai Lu
Cc: Eric Biederman
Signed-off-by: Greg Kroah-Hartman -
This fixes a sysfs lockdep warning in the ipmi code.
Thanks to Eric Biederman and Yinghai Lu for the original versions of the
patch, unfortunatly they did not submit them in a form they could be
applied in.Cc: Yinghai Lu
Cc: Eric Biederman
Signed-off-by: Greg Kroah-Hartman -
PPC64 is failing to boot the latest mmotm due to an uninitialised pointer in
pci_create_legacy_files(). The surprise is that machines boot at all and it
would appear to affect current mainline as well. This patch fixes the problem.Signed-off-by: Mel Gorman
Signed-off-by: Greg Kroah-Hartman -
Annotate dynamic sysfs attribute in fw_setup_device(). This gets
rid of the following lockdep warning:bnx2 0000:08:00.0: firmware: requesting bnx2/bnx2-mips-06-5.0.0.j6.fw
BUG: key ffff880008293470 not in .data!
------------[ cut here ]------------
WARNING: at kernel/lockdep.c:2706 lockdep_init_map+0x562/0x620()
Modules linked in: bnx2(+) sg tpm_bios floppy rtc_lib usb_storage i2c_piix4 joydev button container shpchp i2c_core sr_mod cdrom pci_hotplug usbhid hid ohci_hcd ehci_hcd sd_mod usbcore edd ext3 mbcache jbd fan ata_generic sata_svw pata_serverworks libata scsi_mod thermal processor
Pid: 1915, comm: work_for_cpu Not tainted 2.6.34-rc1-default #81
Call Trace:
[] ? lockdep_init_map+0x562/0x620
[] warn_slowpath_common+0x78/0xd0
[] warn_slowpath_null+0xf/0x20
[] lockdep_init_map+0x562/0x620
[] ? sysfs_new_dirent+0x76/0x120
[] ? put_device+0x12/0x20
[] sysfs_add_file_mode+0x6c/0xd0
[] sysfs_add_file+0xc/0x10
[] sysfs_create_bin_file+0x21/0x30
[] _request_firmware+0x2f1/0x650
[] request_firmware+0xe/0x10
[] bnx2_init_one+0x8f5/0x177e [bnx2]
[] ? _raw_spin_unlock_irq+0x2b/0x40
[] ? finish_task_switch+0x69/0x100
[] ? finish_task_switch+0x0/0x100
[] ? do_work_for_cpu+0x0/0x30
[] local_pci_probe+0x12/0x20
[] do_work_for_cpu+0x13/0x30
[] ? do_work_for_cpu+0x0/0x30
[] kthread+0x96/0xa0
[] kernel_thread_helper+0x4/0x10
[] ? restore_args+0x0/0x30
[] ? kthread+0x0/0xa0
[] ? kernel_thread_helper+0x0/0x10
---[ end trace a2ecee9c9602d195 ]---Cc: Eric W. Biederman
Cc: Greg Kroah-Hartman
Signed-off-by: Jiri Kosina
Signed-off-by: Greg Kroah-Hartman
15 Mar, 2010
21 commits
-
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (34 commits)
ACPI: processor: push file static MADT pointer into internal map_madt_entry()
ACPI: processor: refactor internal map_lsapic_id()
ACPI: processor: refactor internal map_x2apic_id()
ACPI: processor: refactor internal map_lapic_id()
ACPI: processor: driver doesn't need to evaluate _PDC
ACPI: processor: remove early _PDC optin quirks
ACPI: processor: add internal processor_physically_present()
ACPI: processor: move acpi_get_cpuid into processor_core.c
ACPI: processor: export acpi_get_cpuid()
ACPI: processor: mv processor_pdc.c processor_core.c
ACPI: processor: mv processor_core.c processor_driver.c
ACPI: plan to delete "acpi=ht" boot option
ACPI: remove "acpi=ht" DMI blacklist
PNPACPI: add bus number support
PNPACPI: add window support
resource: add window support
resource: add bus number support
resource: expand IORESOURCE_TYPE_BITS to make room for bus resource type
acpiphp: Execute ACPI _REG method for hotadded devices
ACPI video: Be more liberal in validating _BQC behaviour
... -
Commit 6992f5334995af474c2b58d010d08bc597f0f2fe ("sysfs: Use one lockdep
class per sysfs attribute.") introduced this requirement. First, at25
was fixed manually. Then, other occurences were found with coccinelle
and the following semantic patch. Results were reviewed and fixed up:@ init @
identifier struct_name, bin;
@@struct struct_name {
...
struct bin_attribute bin;
...
};@ main extends init @
expression E;
statement S;
identifier name, err;
@@(
struct struct_name *name;
|
- struct struct_name *name = NULL;
+ struct struct_name *name;
)
...
(
sysfs_bin_attr_init(&name->bin);
|
+ sysfs_bin_attr_init(&name->bin);
if (sysfs_create_bin_file(E, &name->bin))
S
|
+ sysfs_bin_attr_init(&name->bin);
err = sysfs_create_bin_file(E, &name->bin);
)Signed-off-by: Wolfram Sang
Cc: Eric W. Biederman
Signed-off-by: Linus Torvalds -
…31916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release
-
There's no real need for a pointer to the MADT to be global. The only
function who uses it is map_madt_entry.This allows us to remove some more ugly #ifdefs.
Acked-by: Venkatesh Pallipadi
Signed-off-by: Alex Chiang
Signed-off-by: Len Brown -
Un-nest the if statements for readability.
Remove comments that re-state the obvious.
Change the control flow so that we no longer need a temp variable.
Acked-by: Venkatesh Pallipadi
Signed-off-by: Alex Chiang
Signed-off-by: Len Brown -
Untangle the nested if conditions to make this function look
more similar to the other map_*apic_id() functions.Acked-by: Venkatesh Pallipadi
Signed-off-by: Alex Chiang
Signed-off-by: Len Brown -
Untangle the if() statement a little for readability.
Acked-by: Venkatesh Pallipadi
Signed-off-by: Alex Chiang
Signed-off-by: Len Brown -
Now that the early _PDC evaluation path knows how to correctly
evaluate _PDC on only physically present processors, there's no
need for the processor driver to evaluate it later when it loads.To cover the hotplug case, push _PDC evaluation down into the
hotplug paths.Cc: x86@kernel.org
Cc: Tony Luck
Acked-by: Venkatesh Pallipadi
Signed-off-by: Alex Chiang
Signed-off-by: Len Brown -
Now that we check for physically present processors before blindly
evaluating _PDC, we no longer need to maintain a DMI opt-in table
nor a kernel param.Acked-by: Venkatesh Pallipadi
Signed-off-by: Alex Chiang
Signed-off-by: Len Brown -
Detect if a processor is physically present before evaluating _PDC.
We want this because some BIOS will provide a _PDC even for processors
that are not present. These bogus _PDC methods then attempt to load
non-existent tables, which causes problems.Avoid those bogus landmines.
Acked-by: Venkatesh Pallipadi
Signed-off-by: Alex Chiang
Signed-off-by: Len Brown -
Enumerating processors (via MADT/_MAT) belongs in the processor core,
which is always built-in, rather than living in the processor driver
which may not be built.Acked-by: Venkatesh Pallipadi
Signed-off-by: Alex Chiang
Signed-off-by: Len Brown -
Rename static get_cpu_id() to acpi_get_cpuid() and export it.
This change also gives us an opportunity to remove the
#ifndef CONFIG_SMP from processor_driver.c and into a header file
where it properly belongs.Acked-by: Venkatesh Pallipadi
Signed-off-by: Alex Chiang
Signed-off-by: Len Brown -
We've renamed the old processor_core.c to processor_driver.c, to
convey the idea that it can be built modular and has driver-like
bits.Now let's re-create a processor_core.c for the bits needed
statically by the rest of the kernel. The contents of processor_pdc.c
are a good starting spot, so let's just rename that file and
complete our three card monte.Acked-by: Venkatesh Pallipadi
Signed-off-by: Alex Chiang
Signed-off-by: Len Brown -
The ACPI processor driver can be built as a module. But it has
pieces of code that should always be built statically into the
kernel.The plan is for processor_core.c to contain the static bits while
processor_driver.c contains the module-like bits.Since the bulk of the code in the current processor_core.c is
module-like, first step is to rename the file to processor_driver.cNext step will re-create processor_core.c and cherry-pick out
the static bits.Acked-by: Venkatesh Pallipadi
Signed-off-by: Alex Chiang
Signed-off-by: Len Brown -
Add support for bus number resources. This is for bridges with a range of
bus numbers behind them. Previously, PNP ignored bus number resources.Signed-off-by: Bjorn Helgaas
Signed-off-by: Len Brown -
Add support for resource windows. This is for bridge resources, i.e.,
regions where a bridge forwards transactions from the primary to the
secondary side. This does not add support for *setting* windows via
the /proc interface.Signed-off-by: Bjorn Helgaas
Signed-off-by: Len Brown -
Per ACPI spec, _ERG method should be executed before device driver
gets control for hotpluged device. Firmware might do some configuration
there. See http://bugzilla.kernel.org/show_bug.cgi?id=10805. In this
machine, _REG method of docked device will configure cardbus bridge.Signed-off-by: Shaohua Li
Tested-by: Paul Martin
Signed-off-by: Len Brown -
Right now, if _BQC returns a value we don't understand we immediately
invalidate it. Change this behaviour so we only invalidate it if it
continues to give an invalid answer after we've already set a brightness.Signed-off-by: Matthew Garrett
Acked-by: Zhang Rui
Signed-off-by: Len Brown -
drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay'
Signed-off-by: Randy Dunlap
Cc: "Richard Röjfors"
Cc: "Ben Dooks (embedded platforms)"
Cc: linux-i2c@vger.kernel.org
Signed-off-by: Stephen Rothwell
Signed-off-by: Linus Torvalds -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: i8042 - add ALDI/MEDION netbook E1222 to qurik reset table
Input: ALPS - fix stuck buttons on some touchpads
Input: wm831x-on - convert to use genirq
Input: ads7846 - add wakeup support
Input: appletouch - fix integer overflow issue
Input: ad7877 - increase pen up imeout
Input: ads7846 - add support for AD7843 parts
Input: bf54x-keys - fix system hang when pressing a key
Input: alps - add support for the touchpad on Toshiba Tecra A11-11L
Input: remove BKL, fix input_open_file() locking
Input: serio_raw - remove BKL
Input: mousedev - remove BKL
Input: add driver for TWL4030 vibrator device
Input: enable remote wakeup for PNP i8042 keyboard ports
Input: scancode in get/set_keycodes should be unsigned
Input: i8042 - use platfrom_create_bundle() helper
Input: wacom - merge out and in prox events
Input: gamecon - fix off by one range check
Input: wacom - replace WACOM_PKGLEN_PENABLED -
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c-algo-bit: Add pre- and post-xfer hooks
at24: Init dynamic bin_attribute structures
i2c: Drop configure option I2C_DEBUG_CHIP
tsl2550: Move from i2c/chips to misc
i2c-i801: Don't use the block buffer for I2C block writes
i2c-powermac: Be less verbose in the absence of real errors.
i2c-smbus: Use device_lock/device_unlock
14 Mar, 2010
12 commits
-
ALDI/MEDION netbook E1222 needs to be in the reset quirk list for
its touchpad's proper function.Reported-by: Michael Fischer
Signed-off-by: Christoph Fritz
Cc: stable@kernel.org
Signed-off-by: Dmitry Torokhov -
Enable button release event redirection to the device that got the
button press not only for touchpads with interleaved protocols, but
unconditionally for all Alps touchpads. This is required at least
for the touchpads in Dell Inspiron 8200 and Latitude d630.Signed-off-by: Martin Buck
Signed-off-by: Dmitry Torokhov -
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Add very basic XVR-1000 framebuffer driver.
qlogicpti: Remove slash in QlogicPTI irq name -
Signed-off-by: David S. Miller
Acked-by: Frans van Berckel -
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (108 commits)
bridge: ensure to unlock in error path in br_multicast_query().
drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages
sky2: Avoid rtnl_unlock without rtnl_lock
ipv6: Send netlink notification when DAD fails
drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant
ipconfig: Handle devices which take some time to come up.
mac80211: Fix memory leak in ieee80211_if_write()
mac80211: Fix (dynamic) power save entry
ipw2200: use kmalloc for large local variables
ath5k: read eeprom IQ calibration values correctly for G mode
ath5k: fix I/Q calibration (for real)
ath5k: fix TSF reset
ath5k: use fixed antenna for tx descriptors
libipw: split ieee->networks into small pieces
mac80211: Fix sta_mtx unlocking on insert STA failure path
rt2x00: remove KSEG1ADDR define from rt2x00soc.h
net: add ColdFire support to the smc91x driver
asix: fix setting mac address for AX88772
ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}.
net: Fix dev_mc_add()
... -
…git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems
x86, UV: Fix target_cpus() in x2apic_uv_x.c
x86: Reduce per cpu warning boot up messages
x86: Reduce per cpu MCA boot up messages
x86_64, cpa: Don't work hard in preserving kernel 2M mappings when using 4K already -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
RDMA/nes: Fix CX4 link problem in back-to-back configuration
RDMA/nes: Clear stall bit before destroying NIC QP
RDMA/nes: Set assume_aligned_header bit
RDMA/cxgb3: Wait at least one schedule cycle during device removal
IB/mad: Ignore iWARP devices on device removal
IPoIB: Include return code in trace message for ib_post_send() failures
IPoIB: Fix TX queue lockup with mixed UD/CM traffic -
On Wed, 2010-03-10 at 08:41 -0800, David Miller wrote:
> From: Mikael Pettersson
> Date: Wed, 10 Mar 2010 16:33:28 +0100
> > Booting 2.6.34-rc1 on a machine with a tulip nic I see
> > a number of kernel messages that include "(null)" where
> > previous kernels included the string "tulip0":
> CC:'ing the guilty party :-) It's one of the following
> commits:Thanks Mikael.
Anonymity has some good attributes.
Blame avoidance is one of them.I've broad shoulders. It's me, then Dwight Howard...
There might be another few of these where ->name or ->dev
was used before struct device or net_device was registered.
I'll go back and check.tulip_core has:
if (tp->flags & HAS_MEDIA_TABLE) {
sprintf(dev->name, DRV_NAME "%d", board_idx); /* hack */
tulip_parse_eeprom(dev);
strcpy(dev->name, "eth%d"); /* un-hack */
}So I don't feel _too_ bad.
tulip_parse_eeprom is done before register_netdev so the logging
there can not use netdev_ or dev_(&dev->devSigned-off-by: Joe Perches
Tested-by: Mikael Pettersson
Signed-off-by: David S. Miller -
Make sure we always call rtnl_lock before going down the
error path in sky2_resume, which unlocks the rtnl lock.Signed-off-by: Mike McCormack
Signed-off-by: David S. Miller -
The constant TG3_FLAG_10_100_ONLY should be used with the tg3_flags field,
not the tg3_flags2 field, as done elsewhere in the same file.Signed-off-by: Julia Lawall
Signed-off-by: David S. Miller -
Drivers might have to do random things before and/or after I2C
transfers. Add hooks to the i2c-algo-bit implementation to let them do
so.Signed-off-by: Jean Delvare
Cc: Alex Deucher