GRU Driver: driver/misc Makefile & Kconfig changes

Driver/misc changes for the GRU driver

Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index f5ade19..4b288f4 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -450,4 +450,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

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index f5e2734..c6c13f6 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -28,4 +28,5 @@ obj-$(CONFIG_INTEL_MENLOW)    += intel_menlow.o
 obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
 obj-$(CONFIG_KGDB_TESTS)       += kgdbts.o
 obj-$(CONFIG_SGI_XP)           += sgi-xp/
+obj-$(CONFIG_SGI_GRU)          += sgi-gru/
 obj-$(CONFIG_HP_ILO)           += hpilo.o