1 files changed, 26 insertions, 1 deletions

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index f5ade1904aad..82af385460e4 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -426,9 +426,11 @@ config ENCLOSURE_SERVICES
 
 config SGI_XP
         tristate "Support communication between SGI SSIs"
-        depends on IA64_GENERIC || IA64_SGI_SN2
+        depends on NET
+        depends on IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || (X86_64 && SMP)
         select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
         select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
+        select SGI_GRU if IA64_GENERIC || IA64_SGI_UV || (X86_64 && SMP)
         ---help---
           An SGI machine can be divided into multiple Single System
           Images which act independently of each other and have
@@ -450,4 +452,27 @@ config HP_ILO
           To compile this driver as a module, choose M here: the
           module will be called hpilo.
 
+config SGI_GRU
+        tristate "SGI GRU driver"
+        depends on (X86_64 || IA64_SGI_UV || IA64_GENERIC) && SMP
+        default n
+        select MMU_NOTIFIER
+        ---help---
+        The GRU is a hardware resource located in the system chipset. The GRU
+        contains memory that can be mmapped into the user address space. This memory is
+        used to communicate with the GRU to perform functions such as load/store,
+        scatter/gather, bcopy, AMOs, etc.  The GRU is directly accessed by user
+        instructions using user virtual addresses. GRU instructions (ex., bcopy) use
+        user virtual addresses for operands.
+
+        If you are not running on a SGI UV system, say N.
+
+config SGI_GRU_DEBUG
+        bool  "SGI GRU driver debug"
+        depends on SGI_GRU
+        default n
+        ---help---
+        This option enables addition debugging code for the SGI GRU driver. If
+        you are unsure, say N.
+
 endif # MISC_DEVICES