diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:33:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:33:49 -0800 |
| commit | 5fc4bcdeadad92d4479f9a66b4e4d57717b13219 (patch) | |
| tree | 3b8a8f4e61a1605fa8f8abd59f8fe4f46d4eeac1 /include | |
| parent | 2d46136da942fda8496a564524dddf2ac3881221 (diff) | |
v2.4.14.5 -> v2.4.14.6
- Russell King: /proc/cpuinfo for ARM
- Paul Mackerras: PPC update (cpuinfo etc)
- Nicolas Aspert: fix Intel 8xx agptlb flush
- Marko Myllynen: "Lindent" doesn't really need bash ;)
- Alexander Viro: /proc/cpuinfo for s390/s390x/sh, /proc/pci cleanup
- Alexander Viro: make lseek work on seqfiles
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/machdep.h | 8 | ||||
| -rw-r--r-- | include/linux/wait.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h index 1515807a276f..184e7cc8d1af 100644 --- a/include/asm-ppc/machdep.h +++ b/include/asm-ppc/machdep.h @@ -1,5 +1,5 @@ /* - * BK Id: SCCS/s.machdep.h 1.23 10/18/01 11:16:28 trini + * BK Id: SCCS/s.machdep.h 1.25 11/13/01 21:26:07 paulus */ #ifdef __KERNEL__ #ifndef _PPC_MACHDEP_H @@ -14,13 +14,13 @@ struct pt_regs; struct pci_bus; struct pci_dev; +struct seq_file; struct machdep_calls { void (*setup_arch)(void); /* Optional, may be NULL. */ - int (*setup_residual)(char *buffer); - /* Optional, may be NULL. */ - int (*get_cpuinfo)(char *buffer); + int (*show_cpuinfo)(struct seq_file *m); + int (*show_percpuinfo)(struct seq_file *m, int i); /* Optional, may be NULL. */ unsigned int (*irq_cannonicalize)(unsigned int irq); void (*init_IRQ)(void); diff --git a/include/linux/wait.h b/include/linux/wait.h index 52906444f233..3503fd2226c5 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -109,12 +109,12 @@ typedef struct __wait_queue_head wait_queue_head_t; } while (0) #define WQ_CHECK_LIST_HEAD(list) \ do { \ - if (!list->next || !list->prev) \ + if (!(list)->next || !(list)->prev) \ WQ_BUG(); \ } while(0) #define WQ_NOTE_WAKER(tsk) \ do { \ - tsk->__waker = (long)__builtin_return_address(0); \ + (tsk)->__waker = (long)__builtin_return_address(0); \ } while (0) #else #define WQ_BUG() |