diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:57:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 00:11:07 -0400 |
| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch) | |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 /drivers/misc/sgi-gru/gruhandles.h | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc/sgi-gru/gruhandles.h')
| -rw-r--r-- | drivers/misc/sgi-gru/gruhandles.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/misc/sgi-gru/gruhandles.h b/drivers/misc/sgi-gru/gruhandles.h index d16031d62673..b63018d60fe1 100644 --- a/drivers/misc/sgi-gru/gruhandles.h +++ b/drivers/misc/sgi-gru/gruhandles.h | |||
| @@ -91,12 +91,7 @@ | |||
| 91 | #define GSEGPOFF(h) ((h) & (GRU_SIZE - 1)) | 91 | #define GSEGPOFF(h) ((h) & (GRU_SIZE - 1)) |
| 92 | 92 | ||
| 93 | /* Convert an arbitrary handle address to the beginning of the GRU segment */ | 93 | /* Convert an arbitrary handle address to the beginning of the GRU segment */ |
| 94 | #ifndef __PLUGIN__ | ||
| 95 | #define GRUBASE(h) ((void *)((unsigned long)(h) & ~(GRU_SIZE - 1))) | 94 | #define GRUBASE(h) ((void *)((unsigned long)(h) & ~(GRU_SIZE - 1))) |
| 96 | #else | ||
| 97 | extern void *gmu_grubase(void *h); | ||
| 98 | #define GRUBASE(h) gmu_grubase(h) | ||
| 99 | #endif | ||
| 100 | 95 | ||
| 101 | /* General addressing macros. */ | 96 | /* General addressing macros. */ |
| 102 | static inline void *get_gseg_base_address(void *base, int ctxnum) | 97 | static inline void *get_gseg_base_address(void *base, int ctxnum) |