aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/x2apic_uv_x.c
diff options
context:
space:
mode:
authorRuss Anderson <rja@sgi.com>2009-12-17 11:53:25 -0500
committerH. Peter Anvin <hpa@zytor.com>2009-12-17 14:33:51 -0500
commitb76365a18f7593c9df32a74bf2b4a39741b67bc6 (patch)
treeb98830bd576337c2f4a074a123834392660c80ae /arch/x86/kernel/apic/x2apic_uv_x.c
parentb8a7f3cd7e8212e5c572178ff3b5a514861036a5 (diff)
x86, uv: Add serial number parameter to uv_bios_get_sn_info()
Add system_serial_number to the information returned by uv_bios_get_sn_info() UV BIOS call. Signed-off-by: Russ Anderson <rja@sgi.com> LKML-Reference: <20091217165323.GA30774@sgi.com> Cc: Jack Steiner <steiner@sgi.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/apic/x2apic_uv_x.c')
-rw-r--r--arch/x86/kernel/apic/x2apic_uv_x.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index b684bb303cbf..af5d103bb533 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -5,7 +5,7 @@
5 * 5 *
6 * SGI UV APIC functions (note: not an Intel compatible APIC) 6 * SGI UV APIC functions (note: not an Intel compatible APIC)
7 * 7 *
8 * Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved. 8 * Copyright (C) 2007-2009 Silicon Graphics, Inc. All rights reserved.
9 */ 9 */
10#include <linux/cpumask.h> 10#include <linux/cpumask.h>
11#include <linux/hardirq.h> 11#include <linux/hardirq.h>
@@ -627,8 +627,8 @@ void __init uv_system_init(void)
627 } 627 }
628 628
629 uv_bios_init(); 629 uv_bios_init();
630 uv_bios_get_sn_info(0, &uv_type, &sn_partition_id, 630 uv_bios_get_sn_info(0, &uv_type, &sn_partition_id, &sn_coherency_id,
631 &sn_coherency_id, &sn_region_size); 631 &sn_region_size, &system_serial_number);
632 uv_rtc_init(); 632 uv_rtc_init();
633 633
634 for_each_present_cpu(cpu) { 634 for_each_present_cpu(cpu) {