diff options
| author | Nathan Scott <nathans@bruce> | 2006-01-12 13:34:47 +1100 |
|---|---|---|
| committer | Nathan Scott <nathans@bruce> | 2006-01-12 13:34:47 +1100 |
| commit | ddae9c2ea79449beb00027cf77fca6dc489f2d15 (patch) | |
| tree | 047c2d7c8d6cbb0721f017514e1d83a20e278d43 /drivers/parisc/power.c | |
| parent | 0d1335b3106687d87fcfa0e4d90f2a961bd7e1db (diff) | |
| parent | a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 (diff) | |
| download | kernel_samsung_smdk4412-ddae9c2ea79449beb00027cf77fca6dc489f2d15.zip kernel_samsung_smdk4412-ddae9c2ea79449beb00027cf77fca6dc489f2d15.tar.gz kernel_samsung_smdk4412-ddae9c2ea79449beb00027cf77fca6dc489f2d15.tar.bz2 | |
Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git
Diffstat (limited to 'drivers/parisc/power.c')
| -rw-r--r-- | drivers/parisc/power.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c index ff75e92..54b2b7f 100644 --- a/drivers/parisc/power.c +++ b/drivers/parisc/power.c @@ -2,7 +2,7 @@ * linux/arch/parisc/kernel/power.c * HP PARISC soft power switch support driver * - * Copyright (c) 2001-2002 Helge Deller <deller@gmx.de> + * Copyright (c) 2001-2005 Helge Deller <deller@gmx.de> * All rights reserved. * * @@ -102,7 +102,7 @@ static DECLARE_WORK(poweroff_work, deferred_poweroff, NULL); static void poweroff(void) { - static int powering_off; + static int powering_off __read_mostly; if (powering_off) return; @@ -113,7 +113,7 @@ static void poweroff(void) /* local time-counter for shutdown */ -static int shutdown_timer; +static int shutdown_timer __read_mostly; /* check, give feedback and start shutdown after one second */ static void process_shutdown(void) @@ -139,7 +139,7 @@ static void process_shutdown(void) DECLARE_TASKLET_DISABLED(power_tasklet, NULL, 0); /* soft power switch enabled/disabled */ -int pwrsw_enabled = 1; +int pwrsw_enabled __read_mostly = 1; /* * On gecko style machines (e.g. 712/xx and 715/xx) @@ -149,7 +149,7 @@ int pwrsw_enabled = 1; */ static void gecko_tasklet_func(unsigned long unused) { - if (!pwrsw_enabled) + if (unlikely(!pwrsw_enabled)) return; if (__getDIAG(25) & 0x80000000) { @@ -173,7 +173,7 @@ static void polling_tasklet_func(unsigned long soft_power_reg) { unsigned long current_status; - if (!pwrsw_enabled) + if (unlikely(!pwrsw_enabled)) return; current_status = gsc_readl(soft_power_reg); |