summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlaf Hering <olh@suse.de>2006-02-04 10:34:56 +0100
committerPaul Mackerras <paulus@samba.org>2006-02-07 21:32:44 +1100
commitd8a8188ded1251afc6a2ec8a668b0bdf038b64a1 (patch)
treef80686e930a20ca33f34bf1eedcd8e9199b716ce
parentb68239ee746760bd99a68692f4c97a28f08a5d01 (diff)
downloadlinux-d8a8188ded1251afc6a2ec8a668b0bdf038b64a1.tar.gz
linux-d8a8188ded1251afc6a2ec8a668b0bdf038b64a1.tar.bz2
linux-d8a8188ded1251afc6a2ec8a668b0bdf038b64a1.zip
[PATCH] powerpc: remove pointer/integer confusion in generic_calibrate_decr
remove pointer/integer confusion Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/kernel/time.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index c4a294d657b9..1886045a2fd8 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -612,10 +612,10 @@ void __init generic_calibrate_decr(void)
ppc_tb_freq = DEFAULT_TB_FREQ; /* hardcoded default */
node_found = 0;
- if (cpu != 0) {
+ if (cpu) {
fp = (unsigned int *)get_property(cpu, "timebase-frequency",
NULL);
- if (fp != 0) {
+ if (fp) {
node_found = 1;
ppc_tb_freq = *fp;
}
@@ -626,10 +626,10 @@ void __init generic_calibrate_decr(void)
ppc_proc_freq = DEFAULT_PROC_FREQ;
node_found = 0;
- if (cpu != 0) {
+ if (cpu) {
fp = (unsigned int *)get_property(cpu, "clock-frequency",
NULL);
- if (fp != 0) {
+ if (fp) {
node_found = 1;
ppc_proc_freq = *fp;
}