diff options
-rw-r--r-- | arch/ia64/kernel/palinfo.c | 8 | ||||
-rw-r--r-- | arch/ia64/kernel/time.c | 2 | ||||
-rw-r--r-- | include/asm-ia64/pal.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c index 89faa603c6be..6386f63c413e 100644 --- a/arch/ia64/kernel/palinfo.c +++ b/arch/ia64/kernel/palinfo.c | |||
@@ -240,7 +240,7 @@ cache_info(char *page) | |||
240 | } | 240 | } |
241 | p += sprintf(p, | 241 | p += sprintf(p, |
242 | "%s Cache level %lu:\n" | 242 | "%s Cache level %lu:\n" |
243 | "\tSize : %lu bytes\n" | 243 | "\tSize : %u bytes\n" |
244 | "\tAttributes : ", | 244 | "\tAttributes : ", |
245 | cache_types[j+cci.pcci_unified], i+1, | 245 | cache_types[j+cci.pcci_unified], i+1, |
246 | cci.pcci_cache_size); | 246 | cci.pcci_cache_size); |
@@ -648,9 +648,9 @@ frequency_info(char *page) | |||
648 | if (ia64_pal_freq_ratios(&proc, &bus, &itc) != 0) return 0; | 648 | if (ia64_pal_freq_ratios(&proc, &bus, &itc) != 0) return 0; |
649 | 649 | ||
650 | p += sprintf(p, | 650 | p += sprintf(p, |
651 | "Processor/Clock ratio : %ld/%ld\n" | 651 | "Processor/Clock ratio : %d/%d\n" |
652 | "Bus/Clock ratio : %ld/%ld\n" | 652 | "Bus/Clock ratio : %d/%d\n" |
653 | "ITC/Clock ratio : %ld/%ld\n", | 653 | "ITC/Clock ratio : %d/%d\n", |
654 | proc.num, proc.den, bus.num, bus.den, itc.num, itc.den); | 654 | proc.num, proc.den, bus.num, bus.den, itc.num, itc.den); |
655 | 655 | ||
656 | return p - page; | 656 | return p - page; |
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index ac167436e936..49958904045b 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
@@ -188,7 +188,7 @@ ia64_init_itm (void) | |||
188 | itc_freq = (platform_base_freq*itc_ratio.num)/itc_ratio.den; | 188 | itc_freq = (platform_base_freq*itc_ratio.num)/itc_ratio.den; |
189 | 189 | ||
190 | local_cpu_data->itm_delta = (itc_freq + HZ/2) / HZ; | 190 | local_cpu_data->itm_delta = (itc_freq + HZ/2) / HZ; |
191 | printk(KERN_DEBUG "CPU %d: base freq=%lu.%03luMHz, ITC ratio=%lu/%lu, " | 191 | printk(KERN_DEBUG "CPU %d: base freq=%lu.%03luMHz, ITC ratio=%u/%u, " |
192 | "ITC freq=%lu.%03luMHz", smp_processor_id(), | 192 | "ITC freq=%lu.%03luMHz", smp_processor_id(), |
193 | platform_base_freq / 1000000, (platform_base_freq / 1000) % 1000, | 193 | platform_base_freq / 1000000, (platform_base_freq / 1000) % 1000, |
194 | itc_ratio.num, itc_ratio.den, itc_freq / 1000000, (itc_freq / 1000) % 1000); | 194 | itc_ratio.num, itc_ratio.den, itc_freq / 1000000, (itc_freq / 1000) % 1000); |
diff --git a/include/asm-ia64/pal.h b/include/asm-ia64/pal.h index 5d229c5953e9..37e52a2836b0 100644 --- a/include/asm-ia64/pal.h +++ b/include/asm-ia64/pal.h | |||
@@ -131,7 +131,7 @@ typedef u64 pal_cache_line_state_t; | |||
131 | #define PAL_CACHE_LINE_STATE_MODIFIED 3 /* Modified */ | 131 | #define PAL_CACHE_LINE_STATE_MODIFIED 3 /* Modified */ |
132 | 132 | ||
133 | typedef struct pal_freq_ratio { | 133 | typedef struct pal_freq_ratio { |
134 | u64 den : 32, num : 32; /* numerator & denominator */ | 134 | u32 den, num; /* numerator & denominator */ |
135 | } itc_ratio, proc_ratio; | 135 | } itc_ratio, proc_ratio; |
136 | 136 | ||
137 | typedef union pal_cache_config_info_1_s { | 137 | typedef union pal_cache_config_info_1_s { |
@@ -152,10 +152,10 @@ typedef union pal_cache_config_info_1_s { | |||
152 | 152 | ||
153 | typedef union pal_cache_config_info_2_s { | 153 | typedef union pal_cache_config_info_2_s { |
154 | struct { | 154 | struct { |
155 | u64 cache_size : 32, /*cache size in bytes*/ | 155 | u32 cache_size; /*cache size in bytes*/ |
156 | 156 | ||
157 | 157 | ||
158 | alias_boundary : 8, /* 39-32 aliased addr | 158 | u32 alias_boundary : 8, /* 39-32 aliased addr |
159 | * separation for max | 159 | * separation for max |
160 | * performance. | 160 | * performance. |
161 | */ | 161 | */ |