diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:51:24 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:51:24 -0500 |
| commit | 3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch) | |
| tree | c4a5236cee8eb7418770802313d36a55f1cc0b1e /include/asm-ppc64/system.h | |
| parent | 7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (diff) | |
| parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-ppc64/system.h')
| -rw-r--r-- | include/asm-ppc64/system.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-ppc64/system.h b/include/asm-ppc64/system.h index 99b8ca52f10..bf9a6aba19c 100644 --- a/include/asm-ppc64/system.h +++ b/include/asm-ppc64/system.h @@ -149,6 +149,8 @@ struct thread_struct; extern struct task_struct * _switch(struct thread_struct *prev, struct thread_struct *next); +extern unsigned long klimit; + extern int powersave_nap; /* set if nap mode can be used in idle loop */ /* @@ -248,7 +250,7 @@ __cmpxchg_u32(volatile unsigned int *p, unsigned long old, unsigned long new) } static __inline__ unsigned long -__cmpxchg_u64(volatile long *p, unsigned long old, unsigned long new) +__cmpxchg_u64(volatile unsigned long *p, unsigned long old, unsigned long new) { unsigned long prev; |