diff options
Diffstat (limited to 'arch/sparc/mm/init_64.c')
-rw-r--r-- | arch/sparc/mm/init_64.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 6ffc7e911d50..c77c7ef5d5d4 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
@@ -779,8 +779,8 @@ static int find_node(unsigned long addr) | |||
779 | return -1; | 779 | return -1; |
780 | } | 780 | } |
781 | 781 | ||
782 | static unsigned long nid_range(unsigned long start, unsigned long end, | 782 | static unsigned long long nid_range(unsigned long long start, |
783 | int *nid) | 783 | unsigned long long end, int *nid) |
784 | { | 784 | { |
785 | *nid = find_node(start); | 785 | *nid = find_node(start); |
786 | start += PAGE_SIZE; | 786 | start += PAGE_SIZE; |
@@ -798,8 +798,8 @@ static unsigned long nid_range(unsigned long start, unsigned long end, | |||
798 | return start; | 798 | return start; |
799 | } | 799 | } |
800 | #else | 800 | #else |
801 | static unsigned long nid_range(unsigned long start, unsigned long end, | 801 | static unsigned long long nid_range(unsigned long long start, |
802 | int *nid) | 802 | unsigned long long end, int *nid) |
803 | { | 803 | { |
804 | *nid = 0; | 804 | *nid = 0; |
805 | return end; | 805 | return end; |
@@ -1026,8 +1026,8 @@ static int __init grab_mlgroups(struct mdesc_handle *md) | |||
1026 | val = mdesc_get_property(md, node, "address-mask", NULL); | 1026 | val = mdesc_get_property(md, node, "address-mask", NULL); |
1027 | m->mask = *val; | 1027 | m->mask = *val; |
1028 | 1028 | ||
1029 | numadbg("MLGROUP[%d]: node[%lx] latency[%lx] " | 1029 | numadbg("MLGROUP[%d]: node[%llx] latency[%llx] " |
1030 | "match[%lx] mask[%lx]\n", | 1030 | "match[%llx] mask[%llx]\n", |
1031 | count - 1, m->node, m->latency, m->match, m->mask); | 1031 | count - 1, m->node, m->latency, m->match, m->mask); |
1032 | } | 1032 | } |
1033 | 1033 | ||
@@ -1066,7 +1066,7 @@ static int __init grab_mblocks(struct mdesc_handle *md) | |||
1066 | "address-congruence-offset", NULL); | 1066 | "address-congruence-offset", NULL); |
1067 | m->offset = *val; | 1067 | m->offset = *val; |
1068 | 1068 | ||
1069 | numadbg("MBLOCK[%d]: base[%lx] size[%lx] offset[%lx]\n", | 1069 | numadbg("MBLOCK[%d]: base[%llx] size[%llx] offset[%llx]\n", |
1070 | count - 1, m->base, m->size, m->offset); | 1070 | count - 1, m->base, m->size, m->offset); |
1071 | } | 1071 | } |
1072 | 1072 | ||
@@ -1137,7 +1137,7 @@ static int __init numa_attach_mlgroup(struct mdesc_handle *md, u64 grp, | |||
1137 | n->mask = candidate->mask; | 1137 | n->mask = candidate->mask; |
1138 | n->val = candidate->match; | 1138 | n->val = candidate->match; |
1139 | 1139 | ||
1140 | numadbg("NUMA NODE[%d]: mask[%lx] val[%lx] (latency[%lx])\n", | 1140 | numadbg("NUMA NODE[%d]: mask[%lx] val[%lx] (latency[%llx])\n", |
1141 | index, n->mask, n->val, candidate->latency); | 1141 | index, n->mask, n->val, candidate->latency); |
1142 | 1142 | ||
1143 | return 0; | 1143 | return 0; |