diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-23 00:22:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-23 00:22:41 -0700 |
| commit | 359f482533ebf0c974eabbcc83df63b841998eb2 (patch) | |
| tree | ae93a243d19f93db7e71acfffe902cd5c50d9136 /include/asm-ppc | |
| parent | 9c46b04a4e3ecec0e96a188c5e68c10c8dd769d3 (diff) | |
| parent | f6297acf85a1c6bfd02ad772e719b8827c9bbd33 (diff) | |
Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Manual merge of kernel/params.c clashes.
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/bug.h | 7 | ||||
| -rw-r--r-- | include/asm-ppc/resource.h | 2 | ||||
| -rw-r--r-- | include/asm-ppc/thread_info.h | 10 |
3 files changed, 6 insertions, 13 deletions
diff --git a/include/asm-ppc/bug.h b/include/asm-ppc/bug.h index 6b2579d9d4ee..e99c6cb9d618 100644 --- a/include/asm-ppc/bug.h +++ b/include/asm-ppc/bug.h @@ -35,8 +35,6 @@ struct bug_entry { } \ } while (0) -#define PAGE_BUG(page) BUG() - #define WARN_ON(x) do { \ if (!__builtin_constant_p(x) || (x)) { \ __asm__ __volatile__( \ @@ -49,4 +47,9 @@ struct bug_entry { } \ } while (0) +#define HAVE_ARCH_BUG +#define HAVE_ARCH_BUG_ON +#define HAVE_ARCH_WARN_ON +#include <asm-generic/bug.h> + #endif diff --git a/include/asm-ppc/resource.h b/include/asm-ppc/resource.h index 3d29914559fc..2953d9bdc8c5 100644 --- a/include/asm-ppc/resource.h +++ b/include/asm-ppc/resource.h @@ -36,7 +36,7 @@ { RLIM_INFINITY, RLIM_INFINITY }, \ { 0, 0 }, \ { INR_OPEN, INR_OPEN }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ + { MLOCK_LIMIT, MLOCK_LIMIT }, \ { RLIM_INFINITY, RLIM_INFINITY }, \ { RLIM_INFINITY, RLIM_INFINITY }, \ { MAX_SIGPENDING, MAX_SIGPENDING }, \ diff --git a/include/asm-ppc/thread_info.h b/include/asm-ppc/thread_info.h index 62aeec9804ea..340235dfc1c9 100644 --- a/include/asm-ppc/thread_info.h +++ b/include/asm-ppc/thread_info.h @@ -65,16 +65,6 @@ static inline struct thread_info *current_thread_info(void) */ #define THREAD_SIZE 8192 /* 2 pages */ -/* - * Offsets in thread_info structure, used in assembly code - */ -#define TI_TASK 0 -#define TI_EXECDOMAIN 4 -#define TI_FLAGS 8 -#define TI_LOCAL_FLAGS 12 -#define TI_CPU 16 -#define TI_PREEMPT 20 - #define PREEMPT_ACTIVE 0x4000000 /* |