diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/asm-ia64/processor.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/asm-ia64/processor.h')
| -rw-r--r-- | include/asm-ia64/processor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h index 6aff126fc07e..f88fa054d01d 100644 --- a/include/asm-ia64/processor.h +++ b/include/asm-ia64/processor.h | |||
| @@ -763,6 +763,8 @@ prefetchw (const void *x) | |||
| 763 | #define spin_lock_prefetch(x) prefetchw(x) | 763 | #define spin_lock_prefetch(x) prefetchw(x) |
| 764 | 764 | ||
| 765 | extern unsigned long boot_option_idle_override; | 765 | extern unsigned long boot_option_idle_override; |
| 766 | extern unsigned long idle_halt; | ||
| 767 | extern unsigned long idle_nomwait; | ||
| 766 | 768 | ||
| 767 | #endif /* !__ASSEMBLY__ */ | 769 | #endif /* !__ASSEMBLY__ */ |
| 768 | 770 | ||