git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/~dwmw2/cafe-2.6
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
sn
/
kernel
/
sn2
/
sn_hwperf.c
diff --git
a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index b632b9c1e3b3e1785ffdc6b678e495c59b805dba..462ea178f49abadfed37375141629013fda98e62 100644
(file)
--- a/
arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/
arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@
-423,7
+423,7
@@
static int sn_topology_show(struct seq_file *s, void *d)
"coherency_domain %d, "
"region_size %d\n",
- partid,
system_utsname.
nodename,
+ partid,
utsname()->
nodename,
shubtype ? "shub2" : "shub1",
(u64)nasid_mask << nasid_shift, nasid_msb, nasid_shift,
system_size, sharing_size, coher, region_size);