diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 08:45:07 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 08:45:07 +0300 |
| commit | 463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc (patch) | |
| tree | 1b9171c109496b7f4991fcae0a2e08ed3bbea10d /arch/i386 | |
| parent | 25c68a33b7b74b37793b1250007e5e21d621a7fc (diff) | |
| parent | 7d63c6759188b9b35c789159f6e02cd02d49ec7d (diff) | |
| download | linux-463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc.tar.xz | |
Pull trivial into test branch
Conflicts:
drivers/acpi/ec.c
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 22 | ||||
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index c8f96cff07c6..094300b3a81f 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -1327,3 +1327,25 @@ static int __init setup_acpi_sci(char *s) return 0; } early_param("acpi_sci", setup_acpi_sci); + +int __acpi_acquire_global_lock(unsigned int *lock) +{ + unsigned int old, new, val; + do { + old = *lock; + new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1)); + val = cmpxchg(lock, old, new); + } while (unlikely (val != old)); + return (new < 3) ? -1 : 0; +} + +int __acpi_release_global_lock(unsigned int *lock) +{ + unsigned int old, new, val; + do { + old = *lock; + new = old & ~0x3; + val = cmpxchg(lock, old, new); + } while (unlikely (val != old)); + return old & 0x1; +} diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c index 18f4715c655d..39bc16bec5aa 100644 --- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c @@ -569,6 +569,7 @@ static int sw_any_bug_found(struct dmi_system_id *d) return 0; } +#ifdef CONFIG_SMP static struct dmi_system_id sw_any_bug_dmi_table[] = { { .callback = sw_any_bug_found, |