diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2004-09-13 10:25:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-09-13 10:25:41 -0700 |
| commit | 5ca8dc165f099da3f72ed6f6c459d6f1f52bd5e5 (patch) | |
| tree | 5969f0de681d489068d758409b44abc2cfc07774 /include/linux | |
| parent | cf11cae7380e2da18f343dc48a1bc3074f2943d0 (diff) | |
| parent | 5c422c68d6e8cb32f6d3525858c5fb8bc71ef754 (diff) | |
Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dma-mapping.h | 1 | ||||
| -rw-r--r-- | include/linux/sched.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 3c545e326d57..806c305332c1 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -1,6 +1,7 @@ #ifndef _ASM_LINUX_DMA_MAPPING_H #define _ASM_LINUX_DMA_MAPPING_H +#include <linux/device.h> #include <linux/err.h> /* These definitions mirror those in pci.h, so they can be used diff --git a/include/linux/sched.h b/include/linux/sched.h index b73710a9ac12..f5d4b9cae523 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1024,6 +1024,9 @@ static inline void arch_pick_mmap_layout(struct mm_struct *mm) } #endif +extern long sched_setaffinity(pid_t pid, cpumask_t new_mask); +extern long sched_getaffinity(pid_t pid, cpumask_t *mask); + #endif /* __KERNEL__ */ #endif |