diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-10 22:09:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-10 22:09:26 +0100 |
| commit | b5562c9a55996735e219b154c1e0f19ec10ce67a (patch) | |
| tree | 8bf5206f70ed428b22e6dd4541c46e7a549a438b /arch/x86/include | |
| parent | Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | x86, UV: Initialize the broadcast assist unit base destination node id properly (diff) | |
| download | linux-b5562c9a55996735e219b154c1e0f19ec10ce67a.tar.xz linux-b5562c9a55996735e219b154c1e0f19ec10ce67a.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, UV: Initialize the broadcast assist unit base destination node id properly
x86, numa: Fix numa_emulation code with memory-less node0
x86, build: Make sure mkpiggy fails on read error
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/uv/uv_bau.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h index ce1d54c8a433..3e094af443c3 100644 --- a/arch/x86/include/asm/uv/uv_bau.h +++ b/arch/x86/include/asm/uv/uv_bau.h @@ -176,7 +176,7 @@ struct bau_msg_payload { struct bau_msg_header { unsigned int dest_subnodeid:6; /* must be 0x10, for the LB */ /* bits 5:0 */ - unsigned int base_dest_nodeid:15; /* nasid (pnode<<1) of */ + unsigned int base_dest_nodeid:15; /* nasid of the */ /* bits 20:6 */ /* first bit in uvhub map */ unsigned int command:8; /* message type */ /* bits 28:21 */ |