ia64: Re-enable /proc/sal support. Bug reported by Stephane Eranian, patch

	by Jesse Barnes.

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index c359b37b1c3e2a814ce2163868bd56a80f5c2390..ffef70740670e2b96d01e6fb18f11b410fd5240c 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -413,6 +413,16 @@ config IA64_PALINFO
          To use this option, you have to ensure that the "/proc file system
          support" (CONFIG_PROC_FS) is enabled, too.
 
+config IA64_SALINFO
+       tristate "/proc/sal support"
+       help
+         The /proc/sal directory exports the SAL (system abstraction layer)
+         feature bits, like whether the platform is subject to ITC drift.  It
+         is intended to be used by user programs that care about such things.
+
+         To use this option, you have to ensure that the "/proc file system
+         support" (CONFIG_PROC_FS) is enabled, too.
+
 config EFI_VARS
        tristate "/proc/efi/vars support"
        help

diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index c865b48e2b16de71d252365c5ba6115861d4bcb2..5c0ea19a28ac75d39de59b0784ad0e497dc79bcd 100644 (file)
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_IA64_GENERIC)    += acpi-ext.o
 obj-$(CONFIG_IA64_HP_ZX1)      += acpi-ext.o
 obj-$(CONFIG_IA64_MCA)         += mca.o mca_asm.o
 obj-$(CONFIG_IA64_PALINFO)     += palinfo.o
+obj-$(CONFIG_IA64_SALINFO)     += salinfo.o
 obj-$(CONFIG_IOSAPIC)          += iosapic.o
 obj-$(CONFIG_MODULES)          += module.o
 obj-$(CONFIG_SMP)              += smp.o smpboot.o

diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index 04f8740c69ab88c4d2015fff3774c0a9b4e12b00..6e1707866c50a36e88f2ddb481f0abd31bb80962 100644 (file)
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2001 Silicon Graphics, Inc.  All rights reserved.
  *
+ * 09/11/2003  jbarnes@sgi.com         updated for 2.6
  * 10/30/2001  jbarnes@sgi.com         copied much of Stephane's palinfo
  *                                     code to create this file
  */
@@ -59,7 +60,7 @@ salinfo_init(void)
                *sdir = create_proc_read_entry (salinfo_entries[i].name, 0, salinfo_dir,
                                                  salinfo_read, (void *)salinfo_entries[i].feature);
                if (*sdir)
-                       *sdir->owner = THIS_MODULE;
+                       (*sdir)->owner = THIS_MODULE;
                sdir++;
        }
        *sdir++ = salinfo_dir;