From: Len Brown Date: Thu, 26 Jul 2012 04:03:58 +0000 (-0400) Subject: Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupl... X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ec033d0a02901551346b9f43f8ff9bad51378891;p=~shefty%2Frdma-dev.git Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupled', 'cpuidle-tweaks', 'intel_idle-ivb', 'ost', 'red-hat-bz-772730', 'thermal', 'thermal-spear' and 'turbostat-v2' into release --- ec033d0a02901551346b9f43f8ff9bad51378891 diff --cc MAINTAINERS index 508a935afe0,b3627098650,14bc7071f9d,707163365a9,b3627098650,b3627098650,b3627098650,55f0fda602e,fe643e7b9df,fe643e7b9df,b3627098650,55f0fda602e..41c06470a59 --- a/MAINTAINERS +++ b/MAINTAINERS @@@@@@@@@@@@@ -1736,11 -1727,10 -1743,11 -1727,10 -1727,10 -1727,10 -1727,10 -1743,11 -1743,11 -1743,11 -1727,10 -1743,11 +1736,11 @@@@@@@@@@@@@ F: include/linux/can/platform CAPABILITIES M: Serge Hallyn L: linux-security-module@vger.kernel.org - ----- --S: Supported + +++++ ++S: Supported F: include/linux/capability.h F: security/capability.c - ----- --F: security/commoncap.c + +++++ ++F: security/commoncap.c + ++++ + F: kernel/capability.c CELL BROADBAND ENGINE ARCHITECTURE M: Arnd Bergmann @@@@@@@@@@@@@ -4094,10 -4036,8 -4101,10 -4034,7 -4036,8 -4036,8 -4036,8 -4094,8 -4105,10 -4105,10 -4036,8 -4094,8 +4098,10 @@@@@@@@@@@@@ F: Documentation/scsi/53c700.tx F: drivers/scsi/53c700* LED SUBSYSTEM + M: Bryan Wu M: Richard Purdie + +++++ ++L: linux-leds@vger.kernel.org + +++++ ++T: git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git S: Maintained F: drivers/leds/ F: include/linux/leds.h @@@@@@@@@@@@@ -5158,10 -5104,10 -5165,10 -5101,10 -5104,10 -5104,10 -5104,10 -5149,10 -5172,10 -5172,10 -5104,10 -5149,10 +5165,10 @@@@@@@@@@@@@ F: drivers/leds/leds-pca9532. F: include/linux/leds-pca9532.h PCA9541 I2C BUS MASTER SELECTOR DRIVER - ----- --M: Guenter Roeck + +++++ ++M: Guenter Roeck L: linux-i2c@vger.kernel.org S: Maintained - ---- - F: drivers/i2c/muxes/pca9541.c + ++++ + F: drivers/i2c/muxes/i2c-mux-pca9541.c PCA9564/PCA9665 I2C BUS DRIVER M: Wolfram Sang @@@@@@@@@@@@@ -5283,14 -5235,6 -5290,14 -5232,6 -5235,6 -5235,6 -5235,6 -5274,14 -5297,14 -5297,14 -5235,6 -5274,14 +5290,14 @@@@@@@@@@@@@ M: Linus Walleij ++++++++ ++M: Viresh Kumar + ++++ + L: spear-devel@list.st.com + ++++ + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) + ++++ + W: http://www.st.com/spear + ++++ + S: Maintained + ++++ + F: driver/pinctrl/spear/ + ++++ + PKTCDVD DRIVER M: Peter Osterlund S: Maintained @@@@@@@@@@@@@ -6362,26 -6298,15 -6369,26 -6295,15 -6298,15 -6298,15 -6298,15 -6353,26 -6378,26 -6378,26 -6298,15 -6353,26 +6371,26 @@@@@@@@@@@@@ S: Maintaine F: include/linux/compiler.h SPEAR PLATFORM SUPPORT -------- --M: Viresh Kumar ++++++++ ++M: Viresh Kumar + ++++ + M: Shiraz Hashim L: spear-devel@list.st.com L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.st.com/spear S: Maintained F: arch/arm/plat-spear/ + ++++ + SPEAR13XX MACHINE SUPPORT - - - -M: Viresh Kumar ++++++++ ++M: Viresh Kumar + ++++ + M: Shiraz Hashim + ++++ + L: spear-devel@list.st.com + ++++ + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) + ++++ + W: http://www.st.com/spear + ++++ + S: Maintained + ++++ + F: arch/arm/mach-spear13xx/ + ++++ + SPEAR3XX MACHINE SUPPORT -------- --M: Viresh Kumar ++++++++ ++M: Viresh Kumar + ++++ + M: Shiraz Hashim L: spear-devel@list.st.com L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.st.com/spear @@@@@@@@@@@@@ -6390,8 -6315,6 -6397,8 -6312,6 -6315,6 -6315,6 -6315,6 -6381,8 -6406,8 -6406,8 -6315,6 -6381,8 +6399,8 @@@@@@@@@@@@@ F: arch/arm/mach-spear3xx SPEAR6XX MACHINE SUPPORT M: Rajeev Kumar + ++++ + M: Shiraz Hashim - - - -M: Viresh Kumar ++++++++ ++M: Viresh Kumar L: spear-devel@list.st.com L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.st.com/spear @@@@@@@@@@@@@ -6399,12 -6322,29 -6406,12 -6319,29 -6322,29 -6322,29 -6322,29 -6390,12 -6415,12 -6415,12 -6322,29 -6390,12 +6408,12 @@@@@@@@@@@@@ S: Maintaine F: arch/arm/mach-spear6xx/ SPEAR CLOCK FRAMEWORK SUPPORT - --- - M: Viresh Kumar - --- - L: spear-devel@list.st.com - --- - L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) - --- - W: http://www.st.com/spear - --- - S: Maintained - --- - F: arch/arm/mach-spear*/clock.c - --- - F: arch/arm/plat-spear/clock.c - --- - F: arch/arm/plat-spear/include/plat/clock.h - --- - - --- - SPEAR PAD MULTIPLEXING SUPPORT -------- --M: Viresh Kumar ++++++++ ++M: Viresh Kumar L: spear-devel@list.st.com L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.st.com/spear S: Maintained - F: arch/arm/mach-spear*/clock.c - F: arch/arm/plat-spear/clock.c - F: arch/arm/plat-spear/include/plat/clock.h - - SPEAR PAD MULTIPLEXING SUPPORT - M: Viresh Kumar - L: spear-devel@list.st.com - L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) - W: http://www.st.com/spear - S: Maintained - ---- - F: arch/arm/plat-spear/include/plat/padmux.h - ---- - F: arch/arm/plat-spear/padmux.c - ---- - F: arch/arm/mach-spear*/spear*xx.c - ---- - F: arch/arm/mach-spear*/include/mach/generic.h - ---- - F: arch/arm/mach-spear3xx/spear3*0.c - ---- - F: arch/arm/mach-spear3xx/spear3*0_evb.c - ---- - F: arch/arm/mach-spear6xx/spear600.c - ---- - F: arch/arm/mach-spear6xx/spear600_evb.c + ++++ + F: drivers/clk/spear/ SPI SUBSYSTEM M: Grant Likely @@@@@@@@@@@@@ -7404,18 -7312,6 -7411,18 -7309,6 -7312,6 -7312,6 -7312,6 -7395,18 -7420,18 -7420,18 -7312,6 -7395,18 +7413,18 @@@@@@@@@@@@@ S: Maintaine F: drivers/vlynq/vlynq.c F: include/linux/vlynq.h + ++++ + VME SUBSYSTEM + ++++ + M: Martyn Welch - - - -M: Manohar Vanga ++++++++ ++M: Manohar Vanga + ++++ + M: Greg Kroah-Hartman + ++++ + L: devel@driverdev.osuosl.org + ++++ + S: Maintained + ++++ + T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git + ++++ + F: Documentation/vme_api.txt + ++++ + F: drivers/staging/vme/ + ++++ + F: drivers/vme/ + ++++ + F: include/linux/vme* + ++++ + VMWARE VMXNET3 ETHERNET DRIVER M: Shreyas Bhatewara M: "VMware, Inc." diff --cc drivers/acpi/bus.c index adceafda9c1,3188da3df8d,adceafda9c1,3263b68cdfa,3188da3df8d,3188da3df8d,3188da3df8d,3d4fc7af02f,adceafda9c1,adceafda9c1,3188da3df8d,adceafda9c1..9628652e080 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@@@@@@@@@@@@ -211,37 -213,10 -211,37 -213,10 -213,10 -213,10 -213,10 -213,10 -211,37 -211,37 -213,10 -211,37 +211,37 @@@@@@@@@@@@@ static int __acpi_bus_get_power(struct /* TBD: Non-recursive algorithm for walking up hierarchy. */ *state = device->parent ? device->parent->power.state : ACPI_STATE_D0; + +++++ + goto out; + } + - ---- - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is D%d\n", - ---- - device->pnp.bus_id, *state)); + +++++ + /* + +++++ + * Get the device's power state either directly (via _PSC) or + +++++ + * indirectly (via power resources). + +++++ + */ + +++++ + if (device->power.flags.explicit_get) { + +++++ + unsigned long long psc; + +++++ + acpi_status status = acpi_evaluate_integer(device->handle, + +++++ + "_PSC", NULL, &psc); + +++++ + if (ACPI_FAILURE(status)) + +++++ + return -ENODEV; + +++++ + + +++++ + result = psc; + +++++ + } + +++++ + /* The test below covers ACPI_STATE_UNKNOWN too. */ + +++++ + if (result <= ACPI_STATE_D2) { + +++++ + ; /* Do nothing. */ + +++++ + } else if (device->power.flags.power_resources) { + +++++ + int error = acpi_power_get_inferred_state(device, &result); + +++++ + if (error) + +++++ + return error; + +++++ + } else if (result == ACPI_STATE_D3_HOT) { + +++++ + result = ACPI_STATE_D3; + ++++ + } + +++++ + *state = result; + ++++ + - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is D%d\n", - device->pnp.bus_id, *state)); + +++++ + out: + +++++ + ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is %s\n", + +++++ + device->pnp.bus_id, state_string(*state))); return 0; } diff --cc drivers/acpi/scan.c index c8a1f3b6811,85cbfdccc97,c8a1f3b6811,7417267e88f,85cbfdccc97,85cbfdccc97,85cbfdccc97,bea3ab6b524,c8a1f3b6811,c8a1f3b6811,85cbfdccc97,c8a1f3b6811..148556a8f0f --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@@@@@@@@@@@@ -129,10 -129,10 -129,10 -129,10 -129,10 -129,10 -129,10 -139,21 -129,10 -129,10 -129,10 -129,10 +139,21 @@@@@@@@@@@@@ void acpi_bus_hot_remove_device(void *c * TBD: _EJD support. */ status = acpi_evaluate_object(handle, "_EJ0", &arg_list, NULL); ------- ---- if (ACPI_FAILURE(status)) ------- ---- printk(KERN_WARNING PREFIX ------- ---- "Eject device failed\n"); +++++++ ++++ if (ACPI_FAILURE(status)) { +++++++ ++++ if (status != AE_NOT_FOUND) +++++++ ++++ printk(KERN_WARNING PREFIX +++++++ ++++ "Eject device failed\n"); +++++++ ++++ goto err_out; +++++++ ++++ } +++ +++ ++++ +++++++ ++++ kfree(context); +++++++ ++++ return; + +++++++ ++++err_out: +++++++ ++++ /* Inform firmware the hot-remove operation has completed w/ error */ +++++++ ++++ (void) acpi_evaluate_hotplug_ost(handle, +++++++ ++++ ej_event->event, ost_code, NULL); +++++++ ++++ kfree(context); return; } diff --cc drivers/thermal/spear_thermal.c index c2e32df3b16,c2e32df3b16,c2e32df3b16,c2e32df3b16,c2e32df3b16,c2e32df3b16,c2e32df3b16,c2e32df3b16,c2e32df3b16,69a55d46aaa,ca40d36d0ba,c2e32df3b16..5f8ee39f200 --- a/drivers/thermal/spear_thermal.c +++ b/drivers/thermal/spear_thermal.c @@@@@@@@@@@@@ -144,10 -144,10 -144,10 -144,10 -144,10 -144,10 -144,10 -144,10 -144,10 -144,10 -143,10 -144,10 +143,10 @@@@@@@@@@@@@ static int spear_thermal_probe(struct p goto put_clk; } ---------- - stdev->flags = pdata->thermal_flags; ++++++++++ + stdev->flags = val; writel_relaxed(stdev->flags, stdev->thermal_base); --------- -- spear_thermal = thermal_zone_device_register("spear_thermal", 0, +++++++++ ++ spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0, stdev, &ops, 0, 0, 0, 0); if (IS_ERR(spear_thermal)) { dev_err(&pdev->dev, "thermal zone device is NULL\n"); diff --cc include/acpi/acpi_bus.h index 9e6e1c6eb60,f1c8ca60e82,9e6e1c6eb60,f1c8ca60e82,f1c8ca60e82,f1c8ca60e82,f1c8ca60e82,62eb514f8e3,9e6e1c6eb60,9e6e1c6eb60,f1c8ca60e82,9e6e1c6eb60..b22b77444b5 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@@@@@@@@@@@@ -50,38 -50,7 -50,38 -50,7 -50,7 -50,7 -50,7 -50,41 -50,38 -50,38 -50,7 -50,38 +50,41 @@@@@@@@@@@@@ acpi_evaluate_reference(acpi_handle han acpi_string pathname, struct acpi_object_list *arguments, struct acpi_handle_list *list); +++++++ ++++acpi_status +++++++ ++++acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event, +++++++ ++++ u32 status_code, struct acpi_buffer *status_buf); + ++++ + + ++++ + struct acpi_pld { + ++++ + unsigned int revision:7; /* 0 */ + ++++ + unsigned int ignore_colour:1; /* 7 */ + ++++ + unsigned int colour:24; /* 8 */ + ++++ + unsigned int width:16; /* 32 */ + ++++ + unsigned int height:16; /* 48 */ + ++++ + unsigned int user_visible:1; /* 64 */ + ++++ + unsigned int dock:1; /* 65 */ + ++++ + unsigned int lid:1; /* 66 */ + ++++ + unsigned int panel:3; /* 67 */ + ++++ + unsigned int vertical_pos:2; /* 70 */ + ++++ + unsigned int horizontal_pos:2; /* 72 */ + ++++ + unsigned int shape:4; /* 74 */ + ++++ + unsigned int group_orientation:1; /* 78 */ + ++++ + unsigned int group_token:8; /* 79 */ + ++++ + unsigned int group_position:8; /* 87 */ + ++++ + unsigned int bay:1; /* 95 */ + ++++ + unsigned int ejectable:1; /* 96 */ + ++++ + unsigned int ospm_eject_required:1; /* 97 */ + ++++ + unsigned int cabinet_number:8; /* 98 */ + ++++ + unsigned int card_cage_number:8; /* 106 */ + ++++ + unsigned int reference:1; /* 114 */ + ++++ + unsigned int rotation:4; /* 115 */ + ++++ + unsigned int order:5; /* 119 */ + ++++ + unsigned int reserved:4; /* 124 */ + ++++ + unsigned int vertical_offset:16; /* 128 */ + ++++ + unsigned int horizontal_offset:16; /* 144 */ + ++++ + } __attribute__((__packed__)); + ++++ + acpi_status + ++++ + acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld *pld); #ifdef CONFIG_ACPI #include @@@@@@@@@@@@@ -438,11 -407,6 -438,11 -407,6 -407,6 -407,6 -407,6 -448,11 -438,11 -438,11 -407,6 -438,11 +448,11 @@@@@@@@@@@@@ static inline int acpi_pm_device_sleep_ } #endif + ++++ + #else /* CONFIG_ACPI */ + ++++ + - static int register_acpi_bus_type(struct acpi_bus_type *bus) { return 0; } - static int unregister_acpi_bus_type(struct acpi_bus_type *bus) { return 0; } + +++++ + static inline int register_acpi_bus_type(void *bus) { return 0; } + +++++ + static inline int unregister_acpi_bus_type(void *bus) { return 0; } + ++++ + #endif /* CONFIG_ACPI */ #endif /*__ACPI_BUS_H__*/