Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / arch / ia64 / kernel / palinfo.c

diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index a4f19c7..fdf6f9d 100644 (file)
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -218,10 +218,10 @@ static int
 cache_info(char *page)
 {
        char *p = page;
-       u64 i, levels, unique_caches;
+       unsigned long i, levels, unique_caches;
        pal_cache_config_info_t cci;
        int j, k;
-       s64 status;
+       long status;
 
        if ((status = ia64_pal_cache_summary(&levels, &unique_caches)) != 0) {
                printk(KERN_ERR "ia64_pal_cache_summary=%ld\n", status);
@@ -303,7 +303,7 @@ vm_info(char *page)
        ia64_ptce_info_t ptce;
        const char *sep;
        int i, j;
-       s64 status;
+       long status;
 
        if ((status = ia64_pal_vm_summary(&vm_info_1, &vm_info_2)) !=0) {
                printk(KERN_ERR "ia64_pal_vm_summary=%ld\n", status);
@@ -431,9 +431,9 @@ register_info(char *page)
        char *p = page;
        u64 reg_info[2];
        u64 info;
-       u64 phys_stacked;
+       unsigned long phys_stacked;
        pal_hints_u_t hints;
-       u64 iregs, dregs;
+       unsigned long iregs, dregs;
        char *info_type[]={
                "Implemented AR(s)",
                "AR(s) with read side-effects",
@@ -530,8 +530,8 @@ static char **proc_features[]={
        NULL, NULL, NULL, NULL,
 };
 
-static char *
-feature_set_info(char *page, u64 avail, u64 status, u64 control, u64 set)
+static char * feature_set_info(char *page, u64 avail, u64 status, u64 control,
+                                                       unsigned long set)
 {
        char *p = page;
        char **vf, **v;
@@ -714,7 +714,7 @@ frequency_info(char *page)
 {
        char *p = page;
        struct pal_freq_ratio proc, itc, bus;
-       u64 base;
+       unsigned long base;
 
        if (ia64_pal_freq_base(&base) == -1)
                p += sprintf(p, "Output clock            : not implemented\n");
@@ -736,43 +736,43 @@ static int
 tr_info(char *page)
 {
        char *p = page;
-       s64 status;
+       long status;
        pal_tr_valid_u_t tr_valid;
        u64 tr_buffer[4];
        pal_vm_info_1_u_t vm_info_1;
        pal_vm_info_2_u_t vm_info_2;
-       u64 i, j;
-       u64 max[3], pgm;
+       unsigned long i, j;
+       unsigned long max[3], pgm;
        struct ifa_reg {
-               u64 valid:1;
-               u64 ig:11;
-               u64 vpn:52;
+               unsigned long valid:1;
+               unsigned long ig:11;
+               unsigned long vpn:52;
        } *ifa_reg;
        struct itir_reg {
-               u64 rv1:2;
-               u64 ps:6;
-               u64 key:24;
-               u64 rv2:32;
+               unsigned long rv1:2;
+               unsigned long ps:6;
+               unsigned long key:24;
+               unsigned long rv2:32;
        } *itir_reg;
        struct gr_reg {
-               u64 p:1;
-               u64 rv1:1;
-               u64 ma:3;
-               u64 a:1;
-               u64 d:1;
-               u64 pl:2;
-               u64 ar:3;
-               u64 ppn:38;
-               u64 rv2:2;
-               u64 ed:1;
-               u64 ig:11;
+               unsigned long p:1;
+               unsigned long rv1:1;
+               unsigned long ma:3;
+               unsigned long a:1;
+               unsigned long d:1;
+               unsigned long pl:2;
+               unsigned long ar:3;
+               unsigned long ppn:38;
+               unsigned long rv2:2;
+               unsigned long ed:1;
+               unsigned long ig:11;
        } *gr_reg;
        struct rid_reg {
-               u64 ig1:1;
-               u64 rv1:1;
-               u64 ig2:6;
-               u64 rid:24;
-               u64 rv2:32;
+               unsigned long ig1:1;
+               unsigned long rv1:1;
+               unsigned long ig2:6;
+               unsigned long rid:24;
+               unsigned long rv2:32;
        } *rid_reg;
 
        if ((status = ia64_pal_vm_summary(&vm_info_1, &vm_info_2)) !=0) {