aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Steiner <steiner@sgi.com>2008-07-30 01:34:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-30 12:41:48 -0400
commit3d919e5f6b440bb0cc7996eb7628b29be09e6343 (patch)
treebc210f908157e9005015987810a6fd820299ea54
parent0d39741a27d86d305cc75ba626392be410dcbab9 (diff)
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>
-rw-r--r--drivers/misc/Kconfig23
-rw-r--r--drivers/misc/Makefile1
2 files changed, 24 insertions, 0 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index f5ade1904aad..4b288f43ca8a 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -450,4 +450,27 @@ config HP_ILO
450 To compile this driver as a module, choose M here: the 450 To compile this driver as a module, choose M here: the
451 module will be called hpilo. 451 module will be called hpilo.
452 452
453config SGI_GRU
454 tristate "SGI GRU driver"
455 depends on (X86_64 || IA64_SGI_UV || IA64_GENERIC) && SMP
456 default n
457 select MMU_NOTIFIER
458 ---help---
459 The GRU is a hardware resource located in the system chipset. The GRU
460 contains memory that can be mmapped into the user address space. This memory is
461 used to communicate with the GRU to perform functions such as load/store,
462 scatter/gather, bcopy, AMOs, etc. The GRU is directly accessed by user
463 instructions using user virtual addresses. GRU instructions (ex., bcopy) use
464 user virtual addresses for operands.
465
466 If you are not running on a SGI UV system, say N.
467
468config SGI_GRU_DEBUG
469 bool "SGI GRU driver debug"
470 depends on SGI_GRU
471 default n
472 ---help---
473 This option enables addition debugging code for the SGI GRU driver. If
474 you are unsure, say N.
475
453endif # MISC_DEVICES 476endif # MISC_DEVICES
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index f5e273420c09..c6c13f60b452 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -28,4 +28,5 @@ obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
28obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o 28obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
29obj-$(CONFIG_KGDB_TESTS) += kgdbts.o 29obj-$(CONFIG_KGDB_TESTS) += kgdbts.o
30obj-$(CONFIG_SGI_XP) += sgi-xp/ 30obj-$(CONFIG_SGI_XP) += sgi-xp/
31obj-$(CONFIG_SGI_GRU) += sgi-gru/
31obj-$(CONFIG_HP_ILO) += hpilo.o 32obj-$(CONFIG_HP_ILO) += hpilo.o