diff options
| author | Vojtech Pavlik <vojtech@suse.cz> | 2002-11-11 11:29:50 +0100 |
|---|---|---|
| committer | Vojtech Pavlik <vojtech@suse.cz> | 2002-11-11 11:29:50 +0100 |
| commit | cdd78a965de150f55dc6bc2836995e5f8bc991a9 (patch) | |
| tree | 9bb3263b0110d8606c393810bf52e7911e59d3df /include/linux | |
| parent | 20889760dda09fd104cfe859b03b3f63300faa83 (diff) | |
| parent | 5be2bc3c89f6813ab0ab21cdd27d6d0f2ee94d91 (diff) | |
Merge suse.cz:/home/vojtech/bk/linus into suse.cz:/home/vojtech/bk/input
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 21 | ||||
| -rw-r--r-- | include/linux/hugetlb.h | 9 | ||||
| -rw-r--r-- | include/linux/sched.h | 3 |
3 files changed, 12 insertions, 21 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 472432a57b06..a3927e6b6dee 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -11,22 +11,6 @@ #include <asm/scatterlist.h> -/* - * Disk stats ... - */ - -#define DK_MAX_MAJOR 16 -#define DK_MAX_DISK 16 - -struct disk_stat { - unsigned int drive[DK_MAX_MAJOR][DK_MAX_DISK]; - unsigned int drive_rio[DK_MAX_MAJOR][DK_MAX_DISK]; - unsigned int drive_wio[DK_MAX_MAJOR][DK_MAX_DISK]; - unsigned int drive_rblk[DK_MAX_MAJOR][DK_MAX_DISK]; - unsigned int drive_wblk[DK_MAX_MAJOR][DK_MAX_DISK]; -}; -extern struct disk_stat dkstat; - struct request_queue; typedef struct request_queue request_queue_t; struct elevator_s; @@ -470,9 +454,4 @@ static inline void put_dev_sector(Sector p) #endif - -extern atomic_t nr_iowait_tasks; -void io_schedule(void); -void io_schedule_timeout(long timeout); - #endif diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 30fa2437be15..37c3621b2f03 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -2,17 +2,25 @@ #define _LINUX_HUGETLB_H #ifdef CONFIG_HUGETLB_PAGE + +struct ctl_table; + static inline int is_vm_hugetlb_page(struct vm_area_struct *vma) { return vma->vm_flags & VM_HUGETLB; } +int hugetlb_sysctl_handler(struct ctl_table *, int, struct file *, void *, size_t *); int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *, struct vm_area_struct *); int follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *, struct page **, struct vm_area_struct **, unsigned long *, int *, int); void zap_hugepage_range(struct vm_area_struct *, unsigned long, unsigned long); void unmap_hugepage_range(struct vm_area_struct *, unsigned long, unsigned long); int hugetlb_prefault(struct address_space *, struct vm_area_struct *); void huge_page_release(struct page *); +int hugetlb_report_meminfo(char *); + +extern int htlbpage_max; + #else /* !CONFIG_HUGETLB_PAGE */ static inline int is_vm_hugetlb_page(struct vm_area_struct *vma) { @@ -25,6 +33,7 @@ static inline int is_vm_hugetlb_page(struct vm_area_struct *vma) #define zap_hugepage_range(vma, start, len) BUG() #define unmap_hugepage_range(vma, start, end) BUG() #define huge_page_release(page) BUG() +#define hugetlb_report_meminfo(buf) 0 #endif /* !CONFIG_HUGETLB_PAGE */ diff --git a/include/linux/sched.h b/include/linux/sched.h index c26b6d0d8d7a..93b1328d59e4 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -88,6 +88,7 @@ extern int nr_threads; extern int last_pid; extern unsigned long nr_running(void); extern unsigned long nr_uninterruptible(void); +extern unsigned long nr_iowait(void); #include <linux/time.h> #include <linux/param.h> @@ -147,6 +148,8 @@ extern void show_trace(unsigned long *stack); extern void show_stack(unsigned long *stack); extern void show_regs(struct pt_regs *); +void io_schedule(void); +void io_schedule_timeout(long timeout); extern void cpu_init (void); extern void trap_init(void); |