diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/acpi.h | 4 | ||||
-rw-r--r-- | include/linux/blkdev.h | 1 | ||||
-rw-r--r-- | include/linux/dcookies.h | 4 | ||||
-rw-r--r-- | include/linux/fs.h | 6 | ||||
-rw-r--r-- | include/linux/fsnotify.h | 31 | ||||
-rw-r--r-- | include/linux/ftape.h | 2 | ||||
-rw-r--r-- | include/linux/input.h | 6 | ||||
-rw-r--r-- | include/linux/mbcache.h | 2 | ||||
-rw-r--r-- | include/linux/mm.h | 22 | ||||
-rw-r--r-- | include/linux/netlink.h | 4 | ||||
-rw-r--r-- | include/linux/pci.h | 5 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 1 | ||||
-rw-r--r-- | include/linux/raid/bitmap.h | 1 | ||||
-rw-r--r-- | include/linux/serial_core.h | 2 | ||||
-rw-r--r-- | include/linux/slab.h | 2 | ||||
-rw-r--r-- | include/linux/swap.h | 3 | ||||
-rw-r--r-- | include/linux/sysctl.h | 1 | ||||
-rw-r--r-- | include/linux/uinput.h | 5 | ||||
-rw-r--r-- | include/linux/usb_input.h | 25 | ||||
-rw-r--r-- | include/linux/watchdog.h | 10 | ||||
-rw-r--r-- | include/linux/zlib.h | 5 |
21 files changed, 96 insertions, 46 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index f85cbe919e13..b46a5205ee7b 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -453,9 +453,7 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); | |||
453 | * If this matches the last registration, any IRQ resources for gsi | 453 | * If this matches the last registration, any IRQ resources for gsi |
454 | * are freed. | 454 | * are freed. |
455 | */ | 455 | */ |
456 | #ifdef CONFIG_ACPI_DEALLOCATE_IRQ | ||
457 | void acpi_unregister_gsi (u32 gsi); | 456 | void acpi_unregister_gsi (u32 gsi); |
458 | #endif | ||
459 | 457 | ||
460 | #ifdef CONFIG_ACPI_PCI | 458 | #ifdef CONFIG_ACPI_PCI |
461 | 459 | ||
@@ -480,9 +478,7 @@ struct pci_dev; | |||
480 | int acpi_pci_irq_enable (struct pci_dev *dev); | 478 | int acpi_pci_irq_enable (struct pci_dev *dev); |
481 | void acpi_penalize_isa_irq(int irq, int active); | 479 | void acpi_penalize_isa_irq(int irq, int active); |
482 | 480 | ||
483 | #ifdef CONFIG_ACPI_DEALLOCATE_IRQ | ||
484 | void acpi_pci_irq_disable (struct pci_dev *dev); | 481 | void acpi_pci_irq_disable (struct pci_dev *dev); |
485 | #endif | ||
486 | 482 | ||
487 | struct acpi_pci_driver { | 483 | struct acpi_pci_driver { |
488 | struct acpi_pci_driver *next; | 484 | struct acpi_pci_driver *next; |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 0881b5cdee3d..19bd8e7e11bf 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -301,6 +301,7 @@ struct blk_queue_tag { | |||
301 | struct list_head busy_list; /* fifo list of busy tags */ | 301 | struct list_head busy_list; /* fifo list of busy tags */ |
302 | int busy; /* current depth */ | 302 | int busy; /* current depth */ |
303 | int max_depth; /* what we will send to device */ | 303 | int max_depth; /* what we will send to device */ |
304 | int real_max_depth; /* what the array can hold */ | ||
304 | atomic_t refcnt; /* map can be shared */ | 305 | atomic_t refcnt; /* map can be shared */ |
305 | }; | 306 | }; |
306 | 307 | ||
diff --git a/include/linux/dcookies.h b/include/linux/dcookies.h index c28050136164..1d68428c925d 100644 --- a/include/linux/dcookies.h +++ b/include/linux/dcookies.h | |||
@@ -48,12 +48,12 @@ int get_dcookie(struct dentry * dentry, struct vfsmount * vfsmnt, | |||
48 | 48 | ||
49 | #else | 49 | #else |
50 | 50 | ||
51 | struct dcookie_user * dcookie_register(void) | 51 | static inline struct dcookie_user * dcookie_register(void) |
52 | { | 52 | { |
53 | return NULL; | 53 | return NULL; |
54 | } | 54 | } |
55 | 55 | ||
56 | void dcookie_unregister(struct dcookie_user * user) | 56 | static inline void dcookie_unregister(struct dcookie_user * user) |
57 | { | 57 | { |
58 | return; | 58 | return; |
59 | } | 59 | } |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 0f53e0124941..f9adf75fd9b4 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -697,11 +697,13 @@ extern struct list_head file_lock_list; | |||
697 | #include <linux/fcntl.h> | 697 | #include <linux/fcntl.h> |
698 | 698 | ||
699 | extern int fcntl_getlk(struct file *, struct flock __user *); | 699 | extern int fcntl_getlk(struct file *, struct flock __user *); |
700 | extern int fcntl_setlk(struct file *, unsigned int, struct flock __user *); | 700 | extern int fcntl_setlk(unsigned int, struct file *, unsigned int, |
701 | struct flock __user *); | ||
701 | 702 | ||
702 | #if BITS_PER_LONG == 32 | 703 | #if BITS_PER_LONG == 32 |
703 | extern int fcntl_getlk64(struct file *, struct flock64 __user *); | 704 | extern int fcntl_getlk64(struct file *, struct flock64 __user *); |
704 | extern int fcntl_setlk64(struct file *, unsigned int, struct flock64 __user *); | 705 | extern int fcntl_setlk64(unsigned int, struct file *, unsigned int, |
706 | struct flock64 __user *); | ||
705 | #endif | 707 | #endif |
706 | 708 | ||
707 | extern void send_sigio(struct fown_struct *fown, int fd, int band); | 709 | extern void send_sigio(struct fown_struct *fown, int fd, int band); |
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h index d07a92c94776..602c305c8585 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h | |||
@@ -21,7 +21,7 @@ | |||
21 | */ | 21 | */ |
22 | static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir, | 22 | static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir, |
23 | const char *old_name, const char *new_name, | 23 | const char *old_name, const char *new_name, |
24 | int isdir) | 24 | int isdir, struct inode *target) |
25 | { | 25 | { |
26 | u32 cookie = inotify_get_cookie(); | 26 | u32 cookie = inotify_get_cookie(); |
27 | 27 | ||
@@ -36,31 +36,30 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir, | |||
36 | isdir = IN_ISDIR; | 36 | isdir = IN_ISDIR; |
37 | inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir,cookie,old_name); | 37 | inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir,cookie,old_name); |
38 | inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie, new_name); | 38 | inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie, new_name); |
39 | |||
40 | if (target) { | ||
41 | inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL); | ||
42 | inotify_inode_is_dead(target); | ||
43 | } | ||
39 | } | 44 | } |
40 | 45 | ||
41 | /* | 46 | /* |
42 | * fsnotify_unlink - file was unlinked | 47 | * fsnotify_nameremove - a filename was removed from a directory |
43 | */ | 48 | */ |
44 | static inline void fsnotify_unlink(struct dentry *dentry, struct inode *dir) | 49 | static inline void fsnotify_nameremove(struct dentry *dentry, int isdir) |
45 | { | 50 | { |
46 | struct inode *inode = dentry->d_inode; | 51 | if (isdir) |
47 | 52 | isdir = IN_ISDIR; | |
48 | inode_dir_notify(dir, DN_DELETE); | 53 | dnotify_parent(dentry, DN_DELETE); |
49 | inotify_inode_queue_event(dir, IN_DELETE, 0, dentry->d_name.name); | 54 | inotify_dentry_parent_queue_event(dentry, IN_DELETE|isdir, 0, dentry->d_name.name); |
50 | inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL); | ||
51 | |||
52 | inotify_inode_is_dead(inode); | ||
53 | } | 55 | } |
54 | 56 | ||
55 | /* | 57 | /* |
56 | * fsnotify_rmdir - directory was removed | 58 | * fsnotify_inoderemove - an inode is going away |
57 | */ | 59 | */ |
58 | static inline void fsnotify_rmdir(struct dentry *dentry, struct inode *inode, | 60 | static inline void fsnotify_inoderemove(struct inode *inode) |
59 | struct inode *dir) | ||
60 | { | 61 | { |
61 | inode_dir_notify(dir, DN_DELETE); | 62 | inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL); |
62 | inotify_inode_queue_event(dir,IN_DELETE|IN_ISDIR,0,dentry->d_name.name); | ||
63 | inotify_inode_queue_event(inode, IN_DELETE_SELF | IN_ISDIR, 0, NULL); | ||
64 | inotify_inode_is_dead(inode); | 63 | inotify_inode_is_dead(inode); |
65 | } | 64 | } |
66 | 65 | ||
diff --git a/include/linux/ftape.h b/include/linux/ftape.h index c6b38d5b9186..72faeec9f6e1 100644 --- a/include/linux/ftape.h +++ b/include/linux/ftape.h | |||
@@ -165,7 +165,7 @@ typedef union { | |||
165 | # undef CONFIG_FT_FDC_DMA | 165 | # undef CONFIG_FT_FDC_DMA |
166 | # define CONFIG_FT_FDC_DMA 2 | 166 | # define CONFIG_FT_FDC_DMA 2 |
167 | # endif | 167 | # endif |
168 | #elif CONFIG_FT_ALT_FDC == 1 /* CONFIG_FT_MACH2 */ | 168 | #elif defined(CONFIG_FT_ALT_FDC) /* CONFIG_FT_MACH2 */ |
169 | # if CONFIG_FT_FDC_BASE == 0 | 169 | # if CONFIG_FT_FDC_BASE == 0 |
170 | # undef CONFIG_FT_FDC_BASE | 170 | # undef CONFIG_FT_FDC_BASE |
171 | # define CONFIG_FT_FDC_BASE 0x370 | 171 | # define CONFIG_FT_FDC_BASE 0x370 |
diff --git a/include/linux/input.h b/include/linux/input.h index b9cc0ac71f44..bdc53c6cc962 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
@@ -811,9 +811,9 @@ struct input_dev { | |||
811 | 811 | ||
812 | void *private; | 812 | void *private; |
813 | 813 | ||
814 | char *name; | 814 | const char *name; |
815 | char *phys; | 815 | const char *phys; |
816 | char *uniq; | 816 | const char *uniq; |
817 | struct input_id id; | 817 | struct input_id id; |
818 | 818 | ||
819 | unsigned long evbit[NBITS(EV_MAX)]; | 819 | unsigned long evbit[NBITS(EV_MAX)]; |
diff --git a/include/linux/mbcache.h b/include/linux/mbcache.h index 8e5a10410a30..9263d2db2d67 100644 --- a/include/linux/mbcache.h +++ b/include/linux/mbcache.h | |||
@@ -29,7 +29,7 @@ struct mb_cache_op { | |||
29 | 29 | ||
30 | struct mb_cache * mb_cache_create(const char *, struct mb_cache_op *, size_t, | 30 | struct mb_cache * mb_cache_create(const char *, struct mb_cache_op *, size_t, |
31 | int, int); | 31 | int, int); |
32 | void mb_cache_shrink(struct mb_cache *, struct block_device *); | 32 | void mb_cache_shrink(struct block_device *); |
33 | void mb_cache_destroy(struct mb_cache *); | 33 | void mb_cache_destroy(struct mb_cache *); |
34 | 34 | ||
35 | /* Functions on cache entries */ | 35 | /* Functions on cache entries */ |
diff --git a/include/linux/mm.h b/include/linux/mm.h index 6eb7f48317f8..82d7024f0765 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -625,10 +625,16 @@ static inline int page_mapped(struct page *page) | |||
625 | * Used to decide whether a process gets delivered SIGBUS or | 625 | * Used to decide whether a process gets delivered SIGBUS or |
626 | * just gets major/minor fault counters bumped up. | 626 | * just gets major/minor fault counters bumped up. |
627 | */ | 627 | */ |
628 | #define VM_FAULT_OOM (-1) | 628 | #define VM_FAULT_OOM 0x00 |
629 | #define VM_FAULT_SIGBUS 0 | 629 | #define VM_FAULT_SIGBUS 0x01 |
630 | #define VM_FAULT_MINOR 1 | 630 | #define VM_FAULT_MINOR 0x02 |
631 | #define VM_FAULT_MAJOR 2 | 631 | #define VM_FAULT_MAJOR 0x03 |
632 | |||
633 | /* | ||
634 | * Special case for get_user_pages. | ||
635 | * Must be in a distinct bit from the above VM_FAULT_ flags. | ||
636 | */ | ||
637 | #define VM_FAULT_WRITE 0x10 | ||
632 | 638 | ||
633 | #define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK) | 639 | #define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK) |
634 | 640 | ||
@@ -704,7 +710,13 @@ extern pte_t *FASTCALL(pte_alloc_kernel(struct mm_struct *mm, pmd_t *pmd, unsign | |||
704 | extern pte_t *FASTCALL(pte_alloc_map(struct mm_struct *mm, pmd_t *pmd, unsigned long address)); | 710 | extern pte_t *FASTCALL(pte_alloc_map(struct mm_struct *mm, pmd_t *pmd, unsigned long address)); |
705 | extern int install_page(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, struct page *page, pgprot_t prot); | 711 | extern int install_page(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, struct page *page, pgprot_t prot); |
706 | extern int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, unsigned long pgoff, pgprot_t prot); | 712 | extern int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long addr, unsigned long pgoff, pgprot_t prot); |
707 | extern int handle_mm_fault(struct mm_struct *mm,struct vm_area_struct *vma, unsigned long address, int write_access); | 713 | extern int __handle_mm_fault(struct mm_struct *mm,struct vm_area_struct *vma, unsigned long address, int write_access); |
714 | |||
715 | static inline int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, int write_access) | ||
716 | { | ||
717 | return __handle_mm_fault(mm, vma, address, write_access) & (~VM_FAULT_WRITE); | ||
718 | } | ||
719 | |||
708 | extern int make_pages_present(unsigned long addr, unsigned long end); | 720 | extern int make_pages_present(unsigned long addr, unsigned long end); |
709 | extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write); | 721 | extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write); |
710 | void install_arg_page(struct vm_area_struct *, struct page *, unsigned long); | 722 | void install_arg_page(struct vm_area_struct *, struct page *, unsigned long); |
diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 70c2a9dc4b2b..6552b71bfa73 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h | |||
@@ -12,15 +12,13 @@ | |||
12 | #define NETLINK_NFLOG 5 /* netfilter/iptables ULOG */ | 12 | #define NETLINK_NFLOG 5 /* netfilter/iptables ULOG */ |
13 | #define NETLINK_XFRM 6 /* ipsec */ | 13 | #define NETLINK_XFRM 6 /* ipsec */ |
14 | #define NETLINK_SELINUX 7 /* SELinux event notifications */ | 14 | #define NETLINK_SELINUX 7 /* SELinux event notifications */ |
15 | #define NETLINK_ARPD 8 | 15 | #define NETLINK_ISCSI 8 /* Open-iSCSI */ |
16 | #define NETLINK_AUDIT 9 /* auditing */ | 16 | #define NETLINK_AUDIT 9 /* auditing */ |
17 | #define NETLINK_FIB_LOOKUP 10 | 17 | #define NETLINK_FIB_LOOKUP 10 |
18 | #define NETLINK_ROUTE6 11 /* af_inet6 route comm channel */ | ||
19 | #define NETLINK_NETFILTER 12 /* netfilter subsystem */ | 18 | #define NETLINK_NETFILTER 12 /* netfilter subsystem */ |
20 | #define NETLINK_IP6_FW 13 | 19 | #define NETLINK_IP6_FW 13 |
21 | #define NETLINK_DNRTMSG 14 /* DECnet routing messages */ | 20 | #define NETLINK_DNRTMSG 14 /* DECnet routing messages */ |
22 | #define NETLINK_KOBJECT_UEVENT 15 /* Kernel messages to userspace */ | 21 | #define NETLINK_KOBJECT_UEVENT 15 /* Kernel messages to userspace */ |
23 | #define NETLINK_TAPBASE 16 /* 16 to 31 are ethertap */ | ||
24 | 22 | ||
25 | #define MAX_LINKS 32 | 23 | #define MAX_LINKS 32 |
26 | 24 | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index 7ac14961ba22..8621cf42b46f 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -971,6 +971,8 @@ static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state, int en | |||
971 | 971 | ||
972 | #define isa_bridge ((struct pci_dev *)NULL) | 972 | #define isa_bridge ((struct pci_dev *)NULL) |
973 | 973 | ||
974 | #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) | ||
975 | |||
974 | #else | 976 | #else |
975 | 977 | ||
976 | /* | 978 | /* |
@@ -985,9 +987,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) | |||
985 | return 0; | 987 | return 0; |
986 | } | 988 | } |
987 | #endif | 989 | #endif |
988 | |||
989 | #define pci_dma_burst_advice(pdev, strat, strategy_parameter) do { } while (0) | ||
990 | |||
991 | #endif /* !CONFIG_PCI */ | 990 | #endif /* !CONFIG_PCI */ |
992 | 991 | ||
993 | /* these helpers provide future and backwards compatibility | 992 | /* these helpers provide future and backwards compatibility |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index d2ad2c4f835a..bc4cc10fabe9 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -1020,6 +1020,7 @@ | |||
1020 | #define PCI_DEVICE_ID_PLX_SPCOM200 0x1103 | 1020 | #define PCI_DEVICE_ID_PLX_SPCOM200 0x1103 |
1021 | #define PCI_DEVICE_ID_PLX_DJINN_ITOO 0x1151 | 1021 | #define PCI_DEVICE_ID_PLX_DJINN_ITOO 0x1151 |
1022 | #define PCI_DEVICE_ID_PLX_R753 0x1152 | 1022 | #define PCI_DEVICE_ID_PLX_R753 0x1152 |
1023 | #define PCI_DEVICE_ID_PLX_OLITEC 0x1187 | ||
1023 | #define PCI_DEVICE_ID_PLX_9030 0x9030 | 1024 | #define PCI_DEVICE_ID_PLX_9030 0x9030 |
1024 | #define PCI_DEVICE_ID_PLX_9050 0x9050 | 1025 | #define PCI_DEVICE_ID_PLX_9050 0x9050 |
1025 | #define PCI_DEVICE_ID_PLX_9060 0x9060 | 1026 | #define PCI_DEVICE_ID_PLX_9060 0x9060 |
diff --git a/include/linux/raid/bitmap.h b/include/linux/raid/bitmap.h index 6213e976eade..4bf1659f8aa8 100644 --- a/include/linux/raid/bitmap.h +++ b/include/linux/raid/bitmap.h | |||
@@ -248,6 +248,7 @@ struct bitmap { | |||
248 | 248 | ||
249 | /* these are used only by md/bitmap */ | 249 | /* these are used only by md/bitmap */ |
250 | int bitmap_create(mddev_t *mddev); | 250 | int bitmap_create(mddev_t *mddev); |
251 | void bitmap_flush(mddev_t *mddev); | ||
251 | void bitmap_destroy(mddev_t *mddev); | 252 | void bitmap_destroy(mddev_t *mddev); |
252 | int bitmap_active(struct bitmap *bitmap); | 253 | int bitmap_active(struct bitmap *bitmap); |
253 | 254 | ||
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 30b64f3534f4..f6fca8f2f3ca 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
@@ -104,7 +104,7 @@ | |||
104 | #define PORT_MPSC 63 | 104 | #define PORT_MPSC 63 |
105 | 105 | ||
106 | /* TXX9 type number */ | 106 | /* TXX9 type number */ |
107 | #define PORT_TXX9 64 | 107 | #define PORT_TXX9 64 |
108 | 108 | ||
109 | /* NEC VR4100 series SIU/DSIU */ | 109 | /* NEC VR4100 series SIU/DSIU */ |
110 | #define PORT_VR41XX_SIU 65 | 110 | #define PORT_VR41XX_SIU 65 |
diff --git a/include/linux/slab.h b/include/linux/slab.h index 4c8e552471b0..80b2dfde2e80 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h | |||
@@ -111,7 +111,7 @@ static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int n | |||
111 | { | 111 | { |
112 | return kmem_cache_alloc(cachep, flags); | 112 | return kmem_cache_alloc(cachep, flags); |
113 | } | 113 | } |
114 | static inline void *kmalloc_node(size_t size, int flags, int node) | 114 | static inline void *kmalloc_node(size_t size, unsigned int __nocast flags, int node) |
115 | { | 115 | { |
116 | return kmalloc(size, flags); | 116 | return kmalloc(size, flags); |
117 | } | 117 | } |
diff --git a/include/linux/swap.h b/include/linux/swap.h index 239f520cc49e..bfe3e763ccf2 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
@@ -7,7 +7,6 @@ | |||
7 | #include <linux/mmzone.h> | 7 | #include <linux/mmzone.h> |
8 | #include <linux/list.h> | 8 | #include <linux/list.h> |
9 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
10 | #include <linux/pagemap.h> | ||
11 | 10 | ||
12 | #include <asm/atomic.h> | 11 | #include <asm/atomic.h> |
13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
@@ -255,6 +254,8 @@ static inline void put_swap_token(struct mm_struct *mm) | |||
255 | 254 | ||
256 | #define si_swapinfo(val) \ | 255 | #define si_swapinfo(val) \ |
257 | do { (val)->freeswap = (val)->totalswap = 0; } while (0) | 256 | do { (val)->freeswap = (val)->totalswap = 0; } while (0) |
257 | /* only sparc can not include linux/pagemap.h in this file | ||
258 | * so leave page_cache_release and release_pages undeclared... */ | ||
258 | #define free_page_and_swap_cache(page) \ | 259 | #define free_page_and_swap_cache(page) \ |
259 | page_cache_release(page) | 260 | page_cache_release(page) |
260 | #define free_pages_and_swap_cache(pages, nr) \ | 261 | #define free_pages_and_swap_cache(pages, nr) \ |
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index bfbbe94b297d..e82be96d4906 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
@@ -145,6 +145,7 @@ enum | |||
145 | KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */ | 145 | KERN_BOOTLOADER_TYPE=67, /* int: boot loader type */ |
146 | KERN_RANDOMIZE=68, /* int: randomize virtual address space */ | 146 | KERN_RANDOMIZE=68, /* int: randomize virtual address space */ |
147 | KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */ | 147 | KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */ |
148 | KERN_SPIN_RETRY=70, /* int: number of spinlock retries */ | ||
148 | }; | 149 | }; |
149 | 150 | ||
150 | 151 | ||
diff --git a/include/linux/uinput.h b/include/linux/uinput.h index 4c2c82336d10..84876077027f 100644 --- a/include/linux/uinput.h +++ b/include/linux/uinput.h | |||
@@ -42,8 +42,7 @@ struct uinput_request { | |||
42 | int code; /* UI_FF_UPLOAD, UI_FF_ERASE */ | 42 | int code; /* UI_FF_UPLOAD, UI_FF_ERASE */ |
43 | 43 | ||
44 | int retval; | 44 | int retval; |
45 | wait_queue_head_t waitq; | 45 | struct completion done; |
46 | int completed; | ||
47 | 46 | ||
48 | union { | 47 | union { |
49 | int effect_id; | 48 | int effect_id; |
@@ -62,7 +61,7 @@ struct uinput_device { | |||
62 | 61 | ||
63 | struct uinput_request *requests[UINPUT_NUM_REQUESTS]; | 62 | struct uinput_request *requests[UINPUT_NUM_REQUESTS]; |
64 | wait_queue_head_t requests_waitq; | 63 | wait_queue_head_t requests_waitq; |
65 | struct semaphore requests_sem; | 64 | spinlock_t requests_lock; |
66 | }; | 65 | }; |
67 | #endif /* __KERNEL__ */ | 66 | #endif /* __KERNEL__ */ |
68 | 67 | ||
diff --git a/include/linux/usb_input.h b/include/linux/usb_input.h new file mode 100644 index 000000000000..716e0cc16043 --- /dev/null +++ b/include/linux/usb_input.h | |||
@@ -0,0 +1,25 @@ | |||
1 | #ifndef __USB_INPUT_H | ||
2 | #define __USB_INPUT_H | ||
3 | |||
4 | /* | ||
5 | * Copyright (C) 2005 Dmitry Torokhov | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License version 2 as published by | ||
9 | * the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #include <linux/usb.h> | ||
13 | #include <linux/input.h> | ||
14 | #include <asm/byteorder.h> | ||
15 | |||
16 | static inline void | ||
17 | usb_to_input_id(const struct usb_device *dev, struct input_id *id) | ||
18 | { | ||
19 | id->bustype = BUS_USB; | ||
20 | id->vendor = le16_to_cpu(dev->descriptor.idVendor); | ||
21 | id->product = le16_to_cpu(dev->descriptor.idProduct); | ||
22 | id->version = le16_to_cpu(dev->descriptor.bcdDevice); | ||
23 | } | ||
24 | |||
25 | #endif | ||
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h index 88ba0d29f8c8..1192ed8f4fe8 100644 --- a/include/linux/watchdog.h +++ b/include/linux/watchdog.h | |||
@@ -47,4 +47,14 @@ struct watchdog_info { | |||
47 | #define WDIOS_ENABLECARD 0x0002 /* Turn on the watchdog timer */ | 47 | #define WDIOS_ENABLECARD 0x0002 /* Turn on the watchdog timer */ |
48 | #define WDIOS_TEMPPANIC 0x0004 /* Kernel panic on temperature trip */ | 48 | #define WDIOS_TEMPPANIC 0x0004 /* Kernel panic on temperature trip */ |
49 | 49 | ||
50 | #ifdef __KERNEL__ | ||
51 | |||
52 | #ifdef CONFIG_WATCHDOG_NOWAYOUT | ||
53 | #define WATCHDOG_NOWAYOUT 1 | ||
54 | #else | ||
55 | #define WATCHDOG_NOWAYOUT 0 | ||
56 | #endif | ||
57 | |||
58 | #endif /* __KERNEL__ */ | ||
59 | |||
50 | #endif /* ifndef _LINUX_WATCHDOG_H */ | 60 | #endif /* ifndef _LINUX_WATCHDOG_H */ |
diff --git a/include/linux/zlib.h b/include/linux/zlib.h index 850076ea14d3..74f7b78c22d2 100644 --- a/include/linux/zlib.h +++ b/include/linux/zlib.h | |||
@@ -506,6 +506,11 @@ extern int zlib_deflateReset (z_streamp strm); | |||
506 | stream state was inconsistent (such as zalloc or state being NULL). | 506 | stream state was inconsistent (such as zalloc or state being NULL). |
507 | */ | 507 | */ |
508 | 508 | ||
509 | static inline unsigned long deflateBound(unsigned long s) | ||
510 | { | ||
511 | return s + ((s + 7) >> 3) + ((s + 63) >> 6) + 11; | ||
512 | } | ||
513 | |||
509 | extern int zlib_deflateParams (z_streamp strm, int level, int strategy); | 514 | extern int zlib_deflateParams (z_streamp strm, int level, int strategy); |
510 | /* | 515 | /* |
511 | Dynamically update the compression level and compression strategy. The | 516 | Dynamically update the compression level and compression strategy. The |