summaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel
diff options
context:
space:
mode:
authorKumar Gala <galak@freescale.com>2005-09-03 15:55:39 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 00:05:57 -0700
commit39cdc4bfb5c587c617ab6a28083c19101154e149 (patch)
treefce5cd394602d0a003124910d32833e9b9f65d68 /arch/ppc/kernel
parentb0531b9b3299f3066b1db78f1693edabbba08b5c (diff)
downloadop-kernel-dev-39cdc4bfb5c587c617ab6a28083c19101154e149.zip
op-kernel-dev-39cdc4bfb5c587c617ab6a28083c19101154e149.tar.gz
[PATCH] ppc32: Cleaned up global namespace of Book-E watchdog variables
Renamed global variables used to convey if the watchdog is enabled and periodicity of the timer and moved the declarations into a header for these variables Signed-off-by: Matt McClintock <msm@freescale.com> Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/kernel')
-rw-r--r--arch/ppc/kernel/setup.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index 9c44588..545cfd0 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -623,10 +623,8 @@ machine_init(unsigned long r3, unsigned long r4, unsigned long r5,
/* Checks wdt=x and wdt_period=xx command-line option */
int __init early_parse_wdt(char *p)
{
- extern u32 wdt_enable;
-
if (p && strncmp(p, "0", 1) != 0)
- wdt_enable = 1;
+ booke_wdt_enabled = 1;
return 0;
}
@@ -634,10 +632,8 @@ early_param("wdt", early_parse_wdt);
int __init early_parse_wdt_period (char *p)
{
- extern u32 wdt_period;
-
if (p)
- wdt_period = simple_strtoul(p, NULL, 0);
+ booke_wdt_period = simple_strtoul(p, NULL, 0);
return 0;
}
OpenPOWER on IntegriCloud