diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
| commit | 708b8eae0fd532af73ea8350e6dcc10255ff7376 (patch) | |
| tree | f336436934fd79bc91aff7112a9beb10bc4e839f /arch/ia64/uv | |
| parent | d98d38f2014ab79f28c126ff175d034891f7aefc (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'arch/ia64/uv')
| -rw-r--r-- | arch/ia64/uv/kernel/setup.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/uv/kernel/setup.c b/arch/ia64/uv/kernel/setup.c index cf5f28ae96c4..7a5ae633198b 100644 --- a/arch/ia64/uv/kernel/setup.c +++ b/arch/ia64/uv/kernel/setup.c | |||
| @@ -19,6 +19,12 @@ EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info); | |||
| 19 | 19 | ||
| 20 | #ifdef CONFIG_IA64_SGI_UV | 20 | #ifdef CONFIG_IA64_SGI_UV |
| 21 | int sn_prom_type; | 21 | int sn_prom_type; |
| 22 | long sn_partition_id; | ||
| 23 | EXPORT_SYMBOL(sn_partition_id); | ||
| 24 | long sn_coherency_id; | ||
| 25 | EXPORT_SYMBOL_GPL(sn_coherency_id); | ||
| 26 | long sn_region_size; | ||
| 27 | EXPORT_SYMBOL(sn_region_size); | ||
| 22 | #endif | 28 | #endif |
| 23 | 29 | ||
| 24 | struct redir_addr { | 30 | struct redir_addr { |