Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 87982
b: refs/heads/master
c: 6143439
h: refs/heads/master
v: v3
  • Loading branch information
Linus Torvalds committed Apr 1, 2008
1 parent 033ebb9 commit 46ac39e
Show file tree
Hide file tree
Showing 16 changed files with 89 additions and 112 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f9e8b782608021c0cbd936923cc0e509521b594d
refs/heads/master: 61434392f797cf89872bda87dff8b3395edf4108
5 changes: 0 additions & 5 deletions trunk/Documentation/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,6 @@ and is between 256 and 4096 characters. It is defined in the file
acpi_irq_isa= [HW,ACPI] If irq_balance, mark listed IRQs used by ISA
Format: <irq>,<irq>...

acpi_new_pts_ordering [HW,ACPI]
Enforce the ACPI 2.0 ordering of the _PTS control
method wrt putting devices into low power states
default: pre ACPI 2.0 ordering of _PTS

acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT

acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS
Expand Down
5 changes: 3 additions & 2 deletions trunk/arch/arm/common/it8152.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
time, when they all three were 0. */
bits_pd = __raw_readl(IT8152_INTC_PDCNIRR);
bits_lp = __raw_readl(IT8152_INTC_LPCNIRR);
bits_ld = __raw_readl(IT8152_INTC_LDCNIRR);
if (!(bits_ld | bits_lp | bits_pd))
return;
}
Expand All @@ -133,14 +134,14 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)

bits_lp &= ((1 << IT8152_LP_IRQ_COUNT) - 1);
while (bits_lp) {
i = __ffs(bits_pd);
i = __ffs(bits_lp);
it8152_irq(IT8152_LP_IRQ(i));
bits_lp &= ~(1 << i);
}

bits_ld &= ((1 << IT8152_LD_IRQ_COUNT) - 1);
while (bits_ld) {
i = __ffs(bits_pd);
i = __ffs(bits_ld);
it8152_irq(IT8152_LD_IRQ(i));
bits_ld &= ~(1 << i);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/kernel/calls.S
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
CALL(sys_mknodat)
/* 325 */ CALL(sys_fchownat)
CALL(sys_futimesat)
CALL(sys_fstatat64)
CALL(ABI(sys_fstatat64, sys_oabi_fstatat64))
CALL(sys_unlinkat)
CALL(sys_renameat)
/* 330 */ CALL(sys_linkat)
Expand Down
24 changes: 24 additions & 0 deletions trunk/arch/arm/kernel/sys_oabi-compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* sys_stat64:
* sys_lstat64:
* sys_fstat64:
* sys_fstatat64:
*
* struct stat64 has different sizes and some members are shifted
* Compatibility wrappers are needed for them and provided below.
Expand Down Expand Up @@ -169,6 +170,29 @@ asmlinkage long sys_oabi_fstat64(unsigned long fd,
return error;
}

asmlinkage long sys_oabi_fstatat64(int dfd,
char __user *filename,
struct oldabi_stat64 __user *statbuf,
int flag)
{
struct kstat stat;
int error = -EINVAL;

if ((flag & ~AT_SYMLINK_NOFOLLOW) != 0)
goto out;

if (flag & AT_SYMLINK_NOFOLLOW)
error = vfs_lstat_fd(dfd, filename, &stat);
else
error = vfs_stat_fd(dfd, filename, &stat);

if (!error)
error = cp_oldabi_stat64(&stat, statbuf);

out:
return error;
}

struct oabi_flock64 {
short l_type;
short l_whence;
Expand Down
71 changes: 14 additions & 57 deletions trunk/drivers/acpi/sleep/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,6 @@ u8 sleep_states[ACPI_S_STATE_COUNT];

#ifdef CONFIG_PM_SLEEP
static u32 acpi_target_sleep_state = ACPI_STATE_S0;
static bool acpi_sleep_finish_wake_up;

/*
* ACPI 2.0 and later want us to execute _PTS after suspending devices, so we
* allow the user to request that behavior by using the 'acpi_new_pts_ordering'
* kernel command line option that causes the following variable to be set.
*/
static bool new_pts_ordering;

static int __init acpi_new_pts_ordering(char *str)
{
new_pts_ordering = true;
return 1;
}
__setup("acpi_new_pts_ordering", acpi_new_pts_ordering);
#endif

static int acpi_sleep_prepare(u32 acpi_state)
Expand Down Expand Up @@ -91,14 +76,6 @@ static int acpi_pm_begin(suspend_state_t pm_state)

if (sleep_states[acpi_state]) {
acpi_target_sleep_state = acpi_state;
if (new_pts_ordering)
return 0;

error = acpi_sleep_prepare(acpi_state);
if (error)
acpi_target_sleep_state = ACPI_STATE_S0;
else
acpi_sleep_finish_wake_up = true;
} else {
printk(KERN_ERR "ACPI does not support this state: %d\n",
pm_state);
Expand All @@ -116,14 +93,11 @@ static int acpi_pm_begin(suspend_state_t pm_state)

static int acpi_pm_prepare(void)
{
if (new_pts_ordering) {
int error = acpi_sleep_prepare(acpi_target_sleep_state);
int error = acpi_sleep_prepare(acpi_target_sleep_state);

if (error) {
acpi_target_sleep_state = ACPI_STATE_S0;
return error;
}
acpi_sleep_finish_wake_up = true;
if (error) {
acpi_target_sleep_state = ACPI_STATE_S0;
return error;
}

return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT;
Expand Down Expand Up @@ -212,7 +186,6 @@ static void acpi_pm_finish(void)
acpi_set_firmware_waking_vector((acpi_physical_address) 0);

acpi_target_sleep_state = ACPI_STATE_S0;
acpi_sleep_finish_wake_up = false;

#ifdef CONFIG_X86
if (init_8259A_after_S1) {
Expand All @@ -229,11 +202,10 @@ static void acpi_pm_finish(void)
static void acpi_pm_end(void)
{
/*
* This is necessary in case acpi_pm_finish() is not called directly
* during a failing transition to a sleep state.
* This is necessary in case acpi_pm_finish() is not called during a
* failing transition to a sleep state.
*/
if (acpi_sleep_finish_wake_up)
acpi_pm_finish();
acpi_target_sleep_state = ACPI_STATE_S0;
}

static int acpi_pm_state_valid(suspend_state_t pm_state)
Expand Down Expand Up @@ -285,31 +257,18 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
#ifdef CONFIG_HIBERNATION
static int acpi_hibernation_begin(void)
{
int error;

acpi_target_sleep_state = ACPI_STATE_S4;
if (new_pts_ordering)
return 0;

error = acpi_sleep_prepare(ACPI_STATE_S4);
if (error)
acpi_target_sleep_state = ACPI_STATE_S0;
else
acpi_sleep_finish_wake_up = true;

return error;
return 0;
}

static int acpi_hibernation_prepare(void)
{
if (new_pts_ordering) {
int error = acpi_sleep_prepare(ACPI_STATE_S4);
int error = acpi_sleep_prepare(ACPI_STATE_S4);

if (error) {
acpi_target_sleep_state = ACPI_STATE_S0;
return error;
}
acpi_sleep_finish_wake_up = true;
if (error) {
acpi_target_sleep_state = ACPI_STATE_S0;
return error;
}

return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT;
Expand Down Expand Up @@ -353,17 +312,15 @@ static void acpi_hibernation_finish(void)
acpi_set_firmware_waking_vector((acpi_physical_address) 0);

acpi_target_sleep_state = ACPI_STATE_S0;
acpi_sleep_finish_wake_up = false;
}

static void acpi_hibernation_end(void)
{
/*
* This is necessary in case acpi_hibernation_finish() is not called
* directly during a failing transition to the sleep state.
* during a failing transition to the sleep state.
*/
if (acpi_sleep_finish_wake_up)
acpi_hibernation_finish();
acpi_target_sleep_state = ACPI_STATE_S0;
}

static int acpi_hibernation_pre_restore(void)
Expand Down
21 changes: 16 additions & 5 deletions trunk/drivers/hwmon/w83781d.c
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,8 @@ w83781d_isa_probe(struct platform_device *pdev)

/* Reserve the ISA region */
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!request_region(res->start, W83781D_EXTENT, "w83781d")) {
if (!request_region(res->start + W83781D_ADDR_REG_OFFSET, 2,
"w83781d")) {
err = -EBUSY;
goto exit;
}
Expand Down Expand Up @@ -1415,7 +1416,7 @@ w83781d_isa_probe(struct platform_device *pdev)
device_remove_file(&pdev->dev, &dev_attr_name);
kfree(data);
exit_release_region:
release_region(res->start, W83781D_EXTENT);
release_region(res->start + W83781D_ADDR_REG_OFFSET, 2);
exit:
return err;
}
Expand All @@ -1429,7 +1430,7 @@ w83781d_isa_remove(struct platform_device *pdev)
sysfs_remove_group(&pdev->dev.kobj, &w83781d_group);
sysfs_remove_group(&pdev->dev.kobj, &w83781d_group_opt);
device_remove_file(&pdev->dev, &dev_attr_name);
release_region(data->client.addr, W83781D_EXTENT);
release_region(data->client.addr + W83781D_ADDR_REG_OFFSET, 2);
kfree(data);

return 0;
Expand Down Expand Up @@ -1797,8 +1798,17 @@ w83781d_isa_found(unsigned short address)
{
int val, save, found = 0;

if (!request_region(address, W83781D_EXTENT, "w83781d"))
/* We have to request the region in two parts because some
boards declare base+4 to base+7 as a PNP device */
if (!request_region(address, 4, "w83781d")) {
pr_debug("w83781d: Failed to request low part of region\n");
return 0;
}
if (!request_region(address + 4, 4, "w83781d")) {
pr_debug("w83781d: Failed to request high part of region\n");
release_region(address, 4);
return 0;
}

#define REALLY_SLOW_IO
/* We need the timeouts for at least some W83781D-like
Expand Down Expand Up @@ -1871,7 +1881,8 @@ w83781d_isa_found(unsigned short address)
val == 0x30 ? "W83782D" : "W83781D", (int)address);

release:
release_region(address, W83781D_EXTENT);
release_region(address + 4, 4);
release_region(address, 4);
return found;
}

Expand Down
7 changes: 2 additions & 5 deletions trunk/drivers/input/apm-power.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ static int apmpower_connect(struct input_handler *handler,
handle->handler = handler;
handle->name = "apm-power";

handler->private = handle;

error = input_register_handle(handle);
if (error) {
printk(KERN_ERR
Expand All @@ -87,11 +85,10 @@ static int apmpower_connect(struct input_handler *handler,
return 0;
}

static void apmpower_disconnect(struct input_handle *handler)
static void apmpower_disconnect(struct input_handle *handle)
{
struct input_handle *handle = handler->private;

input_close_device(handle);
input_unregister_handle(handle);
kfree(handle);
}

Expand Down
6 changes: 2 additions & 4 deletions trunk/drivers/input/evdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ static void evdev_free(struct device *dev)
{
struct evdev *evdev = container_of(dev, struct evdev, dev);

input_put_device(evdev->handle.dev);
kfree(evdev);
}

Expand Down Expand Up @@ -853,9 +854,6 @@ static void evdev_cleanup(struct evdev *evdev)
evdev_hangup(evdev);
evdev_remove_chrdev(evdev);

if (evdev->grab)
evdev_ungrab(evdev, evdev->grab);

/* evdev is marked dead so no one else accesses evdev->open */
if (evdev->open) {
input_flush_device(handle, NULL);
Expand Down Expand Up @@ -896,7 +894,7 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev,
evdev->exist = 1;
evdev->minor = minor;

evdev->handle.dev = dev;
evdev->handle.dev = input_get_device(dev);
evdev->handle.name = evdev->name;
evdev->handle.handler = handler;
evdev->handle.private = evdev;
Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/input/joydev.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ static void joydev_free(struct device *dev)
{
struct joydev *joydev = container_of(dev, struct joydev, dev);

input_put_device(joydev->handle.dev);
kfree(joydev);
}

Expand Down Expand Up @@ -750,7 +751,7 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
joydev->minor = minor;

joydev->exist = 1;
joydev->handle.dev = dev;
joydev->handle.dev = input_get_device(dev);
joydev->handle.name = joydev->name;
joydev->handle.handler = handler;
joydev->handle.private = joydev;
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/input/keyboard/pxa27x_keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
#define KPKDI 0x0048

/* bit definitions */
#define KPC_MKRN(n) ((((n) & 0x7) - 1) << 26) /* matrix key row number */
#define KPC_MKCN(n) ((((n) & 0x7) - 1) << 23) /* matrix key column number */
#define KPC_DKN(n) ((((n) & 0x7) - 1) << 6) /* direct key number */
#define KPC_MKRN(n) ((((n) - 1) & 0x7) << 26) /* matrix key row number */
#define KPC_MKCN(n) ((((n) - 1) & 0x7) << 23) /* matrix key column number */
#define KPC_DKN(n) ((((n) - 1) & 0x7) << 6) /* direct key number */

#define KPC_AS (0x1 << 30) /* Automatic Scan bit */
#define KPC_ASACT (0x1 << 29) /* Automatic Scan on Activity */
Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/input/mousedev.c
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,7 @@ static void mousedev_free(struct device *dev)
{
struct mousedev *mousedev = container_of(dev, struct mousedev, dev);

input_put_device(mousedev->handle.dev);
kfree(mousedev);
}

Expand Down Expand Up @@ -865,7 +866,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev,

mousedev->minor = minor;
mousedev->exist = 1;
mousedev->handle.dev = dev;
mousedev->handle.dev = input_get_device(dev);
mousedev->handle.name = mousedev->name;
mousedev->handle.handler = handler;
mousedev->handle.private = mousedev;
Expand Down
Loading

0 comments on commit 46ac39e

Please sign in to comment.