Showing the changes to include/linux (31 of 877 files). Show all
Unified · Split
| @@ -92,7 +92,6 @@ header-y += if_slip.h · 91 unmodified lines | ||
| 92 | 92 | header-y += if_strip.h |
| 93 | 93 | header-y += if_tun.h |
| 94 | 94 | header-y += if_tunnel.h |
| 95 | −header-y += in6.h | |
| 96 | 95 | header-y += in_route.h |
| 97 | 96 | header-y += ioctl.h |
| 98 | 97 | header-y += ip6_tunnel.h |
| @@ -105,7 +104,6 @@ header-y += ixjuser.h · 6 unmodified lines | ||
| 105 | 104 | header-y += jffs2.h |
| 106 | 105 | header-y += keyctl.h |
| 107 | 106 | header-y += limits.h |
| 108 | −header-y += dlm_plock.h | |
| 109 | 107 | header-y += magic.h |
| 110 | 108 | header-y += major.h |
| 111 | 109 | header-y += matroxfb.h |
| @@ -190,6 +188,7 @@ unifdef-y += cyclades.h · 78 unmodified lines | ||
| 190 | 188 | unifdef-y += dccp.h |
| 191 | 189 | unifdef-y += dirent.h |
| 192 | 190 | unifdef-y += dlm.h |
| 191 | +unifdef-y += dlm_plock.h | |
| 193 | 192 | unifdef-y += edd.h |
| 194 | 193 | unifdef-y += elf.h |
| 195 | 194 | unifdef-y += elfcore.h |
| @@ -236,6 +235,7 @@ unifdef-y += if_vlan.h · 40 unmodified lines | ||
| 236 | 235 | unifdef-y += igmp.h |
| 237 | 236 | unifdef-y += inet_diag.h |
| 238 | 237 | unifdef-y += in.h |
| 238 | +unifdef-y += in6.h | |
| 239 | 239 | unifdef-y += inotify.h |
| 240 | 240 | unifdef-y += input.h |
| 241 | 241 | unifdef-y += ip.h |
| @@ -16,14 +16,11 @@ · 15 unmodified lines | ||
| 16 | 16 | * documentation. Do not change them. |
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | −#ifdef __KERNEL__ | |
| 20 | −#include <linux/socket.h> | |
| 21 | −#include <linux/types.h> | |
| 22 | −#endif | |
| 23 | 19 | #include <linux/compiler.h> |
| 24 | 20 | #include <linux/atmapi.h> |
| 25 | 21 | #include <linux/atmsap.h> |
| 26 | 22 | #include <linux/atmioc.h> |
| 23 | +#include <linux/types.h> | |
| 27 | 24 | |
| 28 | 25 | |
| 29 | 26 | /* general ATM constants */ |
| @@ -212,7 +209,7 @@ struct sockaddr_atmsvc { · 182 unmodified lines | ||
| 212 | 209 | char pub[ATM_E164_LEN+1]; /* public address (E.164) */ |
| 213 | 210 | /* unused addresses must be bzero'ed */ |
| 214 | 211 | char lij_type; /* role in LIJ call; one of ATM_LIJ* */ |
| 215 | − uint32_t lij_id; /* LIJ call identifier */ | |
| 212 | + __u32 lij_id; /* LIJ call identifier */ | |
| 216 | 213 | } sas_addr __ATM_API_ALIGN; /* SVC address */ |
| 217 | 214 | }; |
| 218 | 215 | |
| @@ -8,11 +8,9 @@ · 7 unmodified lines | ||
| 8 | 8 | #define LINUX_ATM_TCP_H |
| 9 | 9 | |
| 10 | 10 | #include <linux/atmapi.h> |
| 11 | − | |
| 12 | −#ifdef __KERNEL__ | |
| 13 | −#include <linux/types.h> | |
| 14 | −#endif | |
| 11 | +#include <linux/atm.h> | |
| 15 | 12 | #include <linux/atmioc.h> |
| 13 | +#include <linux/types.h> | |
| 16 | 14 | |
| 17 | 15 | |
| 18 | 16 | /* |
| @@ -20,9 +18,9 @@ · 1 unmodified line | ||
| 20 | 18 | */ |
| 21 | 19 | |
| 22 | 20 | struct atmtcp_hdr { |
| 23 | − uint16_t vpi; | |
| 24 | − uint16_t vci; | |
| 25 | − uint32_t length; /* ... of data part */ | |
| 21 | + __u16 vpi; | |
| 22 | + __u16 vci; | |
| 23 | + __u32 length; /* ... of data part */ | |
| 26 | 24 | }; |
| 27 | 25 | |
| 28 | 26 | /* |
| @@ -99,6 +99,7 @@ extern int copy_strings_kernel(int argc,char ** argv,struct linux_binprm *bprm); · 98 unmodified lines | ||
| 99 | 99 | extern void compute_creds(struct linux_binprm *binprm); |
| 100 | 100 | extern int do_coredump(long signr, int exit_code, struct pt_regs * regs); |
| 101 | 101 | extern int set_binfmt(struct linux_binfmt *new); |
| 102 | +extern void free_bprm(struct linux_binprm *); | |
| 102 | 103 | |
| 103 | 104 | #endif /* __KERNEL__ */ |
| 104 | 105 | #endif /* _LINUX_BINFMTS_H */ |
| @@ -449,9 +449,21 @@ extern int __must_check device_reprobe(struct device *dev); · 448 unmodified lines | ||
| 449 | 449 | /* |
| 450 | 450 | * Easy functions for dynamically creating devices on the fly |
| 451 | 451 | */ |
| 452 | +extern struct device *device_create_vargs(struct class *cls, | |
| 453 | + struct device *parent, | |
| 454 | + dev_t devt, | |
| 455 | + void *drvdata, | |
| 456 | + const char *fmt, | |
| 457 | + va_list vargs); | |
| 452 | 458 | extern struct device *device_create(struct class *cls, struct device *parent, |
| 453 | 459 | dev_t devt, const char *fmt, ...) |
| 454 | 460 | __attribute__((format(printf, 4, 5))); |
| 461 | +extern struct device *device_create_drvdata(struct class *cls, | |
| 462 | + struct device *parent, | |
| 463 | + dev_t devt, | |
| 464 | + void *drvdata, | |
| 465 | + const char *fmt, ...) | |
| 466 | + __attribute__((format(printf, 5, 6))); | |
| 455 | 467 | extern void device_destroy(struct class *cls, dev_t devt); |
| 456 | 468 | |
| 457 | 469 | /* |
| @@ -93,6 +93,7 @@ struct files_struct *get_files_struct(struct task_struct *); · 92 unmodified lines | ||
| 93 | 93 | void put_files_struct(struct files_struct *fs); |
| 94 | 94 | void reset_files_struct(struct files_struct *); |
| 95 | 95 | int unshare_files(struct files_struct **); |
| 96 | +struct files_struct *dup_fd(struct files_struct *, int *); | |
| 96 | 97 | |
| 97 | 98 | extern struct kmem_cache *files_cachep; |
| 98 | 99 | |
| @@ -8,6 +8,9 @@ · 7 unmodified lines | ||
| 8 | 8 | |
| 9 | 9 | #else |
| 10 | 10 | |
| 11 | +#include <linux/types.h> | |
| 12 | +#include <linux/errno.h> | |
| 13 | + | |
| 11 | 14 | /* |
| 12 | 15 | * Some platforms don't support the GPIO programming interface. |
| 13 | 16 | * |
| @@ -2,8 +2,6 @@ · 1 unmodified line | ||
| 2 | 2 | #define __HID_H |
| 3 | 3 | |
| 4 | 4 | /* |
| 5 | − * $Id: hid.h,v 1.24 2001/12/27 10:37:41 vojtech Exp $ | |
| 6 | − * | |
| 7 | 5 | * Copyright (c) 1999 Andreas Gal |
| 8 | 6 | * Copyright (c) 2000-2001 Vojtech Pavlik |
| 9 | 7 | * Copyright (c) 2006-2007 Jiri Kosina |
| @@ -285,6 +283,7 @@ struct hid_item { · 275 unmodified lines | ||
| 285 | 283 | #define HID_QUIRK_HWHEEL_WHEEL_INVERT 0x04000000 |
| 286 | 284 | #define HID_QUIRK_MICROSOFT_KEYS 0x08000000 |
| 287 | 285 | #define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000 |
| 286 | +#define HID_QUIRK_APPLE_NUMLOCK_EMULATION 0x20000000 | |
| 288 | 287 | |
| 289 | 288 | /* |
| 290 | 289 | * Separate quirks for runtime report descriptor fixup |
| @@ -2,8 +2,6 @@ · 1 unmodified line | ||
| 2 | 2 | #define _HIDDEV_H |
| 3 | 3 | |
| 4 | 4 | /* |
| 5 | − * $Id: hiddev.h,v 1.2 2001/04/26 11:26:09 vojtech Exp $ | |
| 6 | − * | |
| 7 | 5 | * Copyright (c) 1999-2000 Vojtech Pavlik |
| 8 | 6 | * |
| 9 | 7 | * Sponsored by SuSE |
| @@ -155,8 +155,6 @@ struct i2c_driver { · 154 unmodified lines | ||
| 155 | 155 | * @driver: device's driver, hence pointer to access routines |
| 156 | 156 | * @dev: Driver model device node for the slave. |
| 157 | 157 | * @irq: indicates the IRQ generated by this device (if any) |
| 158 | − * @driver_name: Identifies new-style driver used with this device; also | |
| 159 | − * used as the module name for hotplug/coldplug modprobe support. | |
| 160 | 158 | * @list: list of active/busy clients (DEPRECATED) |
| 161 | 159 | * @released: used to synchronize client releases & detaches and references |
| 162 | 160 | * |
| @@ -174,7 +172,6 @@ struct i2c_client { · 11 unmodified lines | ||
| 174 | 172 | struct i2c_driver *driver; /* and our access routines */ |
| 175 | 173 | struct device dev; /* the device structure */ |
| 176 | 174 | int irq; /* irq issued by device (or -1) */ |
| 177 | − char driver_name[KOBJ_NAME_LEN]; | |
| 178 | 175 | struct list_head list; /* DEPRECATED */ |
| 179 | 176 | struct completion released; |
| 180 | 177 | }; |
| @@ -200,8 +197,7 @@ static inline void i2c_set_clientdata (struct i2c_client *dev, void *data) · 19 unmodified lines | ||
| 200 | 197 | |
| 201 | 198 | /** |
| 202 | 199 | * struct i2c_board_info - template for device creation |
| 203 | − * @driver_name: identifies the driver to be bound to the device | |
| 204 | − * @type: optional chip type information, to initialize i2c_client.name | |
| 200 | + * @type: chip type, to initialize i2c_client.name | |
| 205 | 201 | * @flags: to initialize i2c_client.flags |
| 206 | 202 | * @addr: stored in i2c_client.addr |
| 207 | 203 | * @platform_data: stored in i2c_client.dev.platform_data |
| @@ -220,7 +216,6 @@ static inline void i2c_set_clientdata (struct i2c_client *dev, void *data) · 12 unmodified lines | ||
| 220 | 216 | * with the adapter already known. |
| 221 | 217 | */ |
| 222 | 218 | struct i2c_board_info { |
| 223 | − char driver_name[KOBJ_NAME_LEN]; | |
| 224 | 219 | char type[I2C_NAME_SIZE]; |
| 225 | 220 | unsigned short flags; |
| 226 | 221 | unsigned short addr; |
| @@ -12,8 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | * @context: optional parameter passed to setup() and teardown() |
| 13 | 13 | * |
| 14 | 14 | * In addition to the I2C_BOARD_INFO() state appropriate to each chip, |
| 15 | − * the i2c_board_info used with the pcf875x driver must provide the | |
| 16 | − * chip "type" ("pcf8574", "pcf8574a", "pcf8575", "pcf8575c") and its | |
| 15 | + * the i2c_board_info used with the pcf875x driver must provide its | |
| 17 | 16 | * platform_data (pointer to one of these structures) with at least |
| 18 | 17 | * the gpio_base value initialized. |
| 19 | 18 | * |
| @@ -1,7 +1,6 @@ | ||
| 1 | 1 | #ifndef _LINUX__INIT_TASK_H |
| 2 | 2 | #define _LINUX__INIT_TASK_H |
| 3 | 3 | |
| 4 | −#include <linux/fdtable.h> | |
| 5 | 4 | #include <linux/rcupdate.h> |
| 6 | 5 | #include <linux/irqflags.h> |
| 7 | 6 | #include <linux/utsname.h> |
| @@ -12,27 +11,7 @@ · 4 unmodified lines | ||
| 12 | 11 | #include <linux/securebits.h> |
| 13 | 12 | #include <net/net_namespace.h> |
| 14 | 13 | |
| 15 | −#define INIT_FDTABLE \ | |
| 16 | −{ \ | |
| 17 | − .max_fds = NR_OPEN_DEFAULT, \ | |
| 18 | − .fd = &init_files.fd_array[0], \ | |
| 19 | − .close_on_exec = (fd_set *)&init_files.close_on_exec_init, \ | |
| 20 | − .open_fds = (fd_set *)&init_files.open_fds_init, \ | |
| 21 | − .rcu = RCU_HEAD_INIT, \ | |
| 22 | − .next = NULL, \ | |
| 23 | −} | |
| 24 | − | |
| 25 | −#define INIT_FILES \ | |
| 26 | −{ \ | |
| 27 | − .count = ATOMIC_INIT(1), \ | |
| 28 | − .fdt = &init_files.fdtab, \ | |
| 29 | − .fdtab = INIT_FDTABLE, \ | |
| 30 | − .file_lock = __SPIN_LOCK_UNLOCKED(init_task.file_lock), \ | |
| 31 | − .next_fd = 0, \ | |
| 32 | − .close_on_exec_init = { { 0, } }, \ | |
| 33 | − .open_fds_init = { { 0, } }, \ | |
| 34 | − .fd_array = { NULL, } \ | |
| 35 | −} | |
| 14 | +extern struct files_struct init_files; | |
| 36 | 15 | |
| 37 | 16 | #define INIT_KIOCTX(name, which_mm) \ |
| 38 | 17 | { \ |
| @@ -341,7 +341,7 @@ enum { · 340 unmodified lines | ||
| 341 | 341 | ATA_EH_PMP_TRIES = 5, |
| 342 | 342 | ATA_EH_PMP_LINK_TRIES = 3, |
| 343 | 343 | |
| 344 | − SATA_PMP_SCR_TIMEOUT = 250, | |
| 344 | + SATA_PMP_RW_TIMEOUT = 3000, /* PMP read/write timeout */ | |
| 345 | 345 | |
| 346 | 346 | /* Horkage types. May be set by libata or controller on drives |
| 347 | 347 | (some horkage may be drive/controller pair dependant */ |
| @@ -351,7 +351,7 @@ enum { · 3 unmodified lines | ||
| 351 | 351 | ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */ |
| 352 | 352 | ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */ |
| 353 | 353 | ATA_HORKAGE_BROKEN_HPA = (1 << 4), /* Broken HPA */ |
| 354 | − ATA_HORKAGE_SKIP_PM = (1 << 5), /* Skip PM operations */ | |
| 354 | + ATA_HORKAGE_DISABLE = (1 << 5), /* Disable it */ | |
| 355 | 355 | ATA_HORKAGE_HPA_SIZE = (1 << 6), /* native size off by one */ |
| 356 | 356 | ATA_HORKAGE_IPM = (1 << 7), /* Link PM problems */ |
| 357 | 357 | ATA_HORKAGE_IVB = (1 << 8), /* cbl det validity bit bugs */ |
| @@ -821,8 +821,6 @@ struct ata_timing { · 463 unmodified lines | ||
| 821 | 821 | unsigned short udma; /* t2CYCTYP/2 */ |
| 822 | 822 | }; |
| 823 | 823 | |
| 824 | −#define FIT(v, vmin, vmax) max_t(short, min_t(short, v, vmax), vmin) | |
| 825 | − | |
| 826 | 824 | /* |
| 827 | 825 | * Core layer - drivers/ata/libata-core.c |
| 828 | 826 | */ |
| @@ -17,14 +17,14 @@ · 16 unmodified lines | ||
| 17 | 17 | |
| 18 | 18 | extern int sysctl_overcommit_memory; |
| 19 | 19 | extern int sysctl_overcommit_ratio; |
| 20 | −extern atomic_t vm_committed_space; | |
| 20 | +extern atomic_long_t vm_committed_space; | |
| 21 | 21 | |
| 22 | 22 | #ifdef CONFIG_SMP |
| 23 | 23 | extern void vm_acct_memory(long pages); |
| 24 | 24 | #else |
| 25 | 25 | static inline void vm_acct_memory(long pages) |
| 26 | 26 | { |
| 27 | − atomic_add(pages, &vm_committed_space); | |
| 27 | + atomic_long_add(pages, &vm_committed_space); | |
| 28 | 28 | } |
| 29 | 29 | #endif |
| 30 | 30 | |
| @@ -703,7 +703,7 @@ extern struct pglist_data *next_online_pgdat(struct pglist_data *pgdat); · 702 unmodified lines | ||
| 703 | 703 | extern struct zone *next_zone(struct zone *zone); |
| 704 | 704 | |
| 705 | 705 | /** |
| 706 | − * for_each_pgdat - helper macro to iterate over all nodes | |
| 706 | + * for_each_online_pgdat - helper macro to iterate over all online nodes | |
| 707 | 707 | * @pgdat - pointer to a pg_data_t variable |
| 708 | 708 | */ |
| 709 | 709 | #define for_each_online_pgdat(pgdat) \ |
| @@ -375,7 +375,8 @@ struct virtio_device_id { · 374 unmodified lines | ||
| 375 | 375 | |
| 376 | 376 | struct i2c_device_id { |
| 377 | 377 | char name[I2C_NAME_SIZE]; |
| 378 | − kernel_ulong_t driver_data; /* Data private to the driver */ | |
| 378 | + kernel_ulong_t driver_data /* Data private to the driver */ | |
| 379 | + __attribute__((aligned(sizeof(kernel_ulong_t)))); | |
| 379 | 380 | }; |
| 380 | 381 | |
| 381 | 382 | |
| @@ -745,6 +745,9 @@ struct net_device · 744 unmodified lines | ||
| 745 | 745 | /* rtnetlink link ops */ |
| 746 | 746 | const struct rtnl_link_ops *rtnl_link_ops; |
| 747 | 747 | |
| 748 | + /* VLAN feature mask */ | |
| 749 | + unsigned long vlan_features; | |
| 750 | + | |
| 748 | 751 | /* for setting kernel sock attribute on TCP connection setup */ |
| 749 | 752 | #define GSO_MAX_SIZE 65536 |
| 750 | 753 | unsigned int gso_max_size; |
| @@ -3,7 +3,6 @@ · 2 unmodified lines | ||
| 3 | 3 | |
| 4 | 4 | #ifdef __KERNEL__ |
| 5 | 5 | #include <linux/init.h> |
| 6 | −#include <linux/types.h> | |
| 7 | 6 | #include <linux/skbuff.h> |
| 8 | 7 | #include <linux/net.h> |
| 9 | 8 | #include <linux/netdevice.h> |
| @@ -14,6 +13,7 @@ · 4 unmodified lines | ||
| 14 | 13 | #include <linux/list.h> |
| 15 | 14 | #include <net/net_namespace.h> |
| 16 | 15 | #endif |
| 16 | +#include <linux/types.h> | |
| 17 | 17 | #include <linux/compiler.h> |
| 18 | 18 | |
| 19 | 19 | /* Responses from hook functions. */ |
| @@ -11,11 +11,11 @@ · 10 unmodified lines | ||
| 11 | 11 | |
| 12 | 12 | #ifdef __KERNEL__ |
| 13 | 13 | #include <linux/if.h> |
| 14 | −#include <linux/types.h> | |
| 15 | 14 | #include <linux/in.h> |
| 16 | 15 | #include <linux/if_arp.h> |
| 17 | 16 | #include <linux/skbuff.h> |
| 18 | 17 | #endif |
| 18 | +#include <linux/types.h> | |
| 19 | 19 | #include <linux/compiler.h> |
| 20 | 20 | #include <linux/netfilter_arp.h> |
| 21 | 21 | |
| @@ -17,11 +17,11 @@ · 16 unmodified lines | ||
| 17 | 17 | |
| 18 | 18 | #ifdef __KERNEL__ |
| 19 | 19 | #include <linux/if.h> |
| 20 | −#include <linux/types.h> | |
| 21 | 20 | #include <linux/in.h> |
| 22 | 21 | #include <linux/ip.h> |
| 23 | 22 | #include <linux/skbuff.h> |
| 24 | 23 | #endif |
| 24 | +#include <linux/types.h> | |
| 25 | 25 | #include <linux/compiler.h> |
| 26 | 26 | #include <linux/netfilter_ipv4.h> |
| 27 | 27 | |
| @@ -17,11 +17,11 @@ · 16 unmodified lines | ||
| 17 | 17 | |
| 18 | 18 | #ifdef __KERNEL__ |
| 19 | 19 | #include <linux/if.h> |
| 20 | −#include <linux/types.h> | |
| 21 | 20 | #include <linux/in6.h> |
| 22 | 21 | #include <linux/ipv6.h> |
| 23 | 22 | #include <linux/skbuff.h> |
| 24 | 23 | #endif |
| 24 | +#include <linux/types.h> | |
| 25 | 25 | #include <linux/compiler.h> |
| 26 | 26 | #include <linux/netfilter_ipv6.h> |
| 27 | 27 | |
| @@ -1761,6 +1761,7 @@ · 1760 unmodified lines | ||
| 1761 | 1761 | |
| 1762 | 1762 | #define PCI_VENDOR_ID_INTASHIELD 0x135a |
| 1763 | 1763 | #define PCI_DEVICE_ID_INTASHIELD_IS200 0x0d80 |
| 1764 | +#define PCI_DEVICE_ID_INTASHIELD_IS400 0x0dc0 | |
| 1764 | 1765 | |
| 1765 | 1766 | #define PCI_VENDOR_ID_QUATECH 0x135C |
| 1766 | 1767 | #define PCI_DEVICE_ID_QUATECH_QSC100 0x0010 |
| @@ -2383,6 +2384,9 @@ · 616 unmodified lines | ||
| 2383 | 2384 | #define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30 |
| 2384 | 2385 | #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60 |
| 2385 | 2386 | #define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f |
| 2387 | +#define PCI_DEVICE_ID_INTEL_5400_ERR 0x4030 | |
| 2388 | +#define PCI_DEVICE_ID_INTEL_5400_FBD0 0x4035 | |
| 2389 | +#define PCI_DEVICE_ID_INTEL_5400_FBD1 0x4036 | |
| 2386 | 2390 | #define PCI_DEVICE_ID_INTEL_IOAT_SCNB 0x65ff |
| 2387 | 2391 | #define PCI_DEVICE_ID_INTEL_TOLAPAI_0 0x5031 |
| 2388 | 2392 | #define PCI_DEVICE_ID_INTEL_TOLAPAI_1 0x5032 |
| @@ -262,7 +262,6 @@ int bitmap_create(mddev_t *mddev); · 261 unmodified lines | ||
| 262 | 262 | void bitmap_flush(mddev_t *mddev); |
| 263 | 263 | void bitmap_destroy(mddev_t *mddev); |
| 264 | 264 | |
| 265 | −char *file_path(struct file *file, char *buf, int count); | |
| 266 | 265 | void bitmap_print_sb(struct bitmap *bitmap); |
| 267 | 266 | void bitmap_update_sb(struct bitmap *bitmap); |
| 268 | 267 | |
| @@ -72,6 +72,8 @@ · 71 unmodified lines | ||
| 72 | 72 | */ |
| 73 | 73 | #define MD_PATCHLEVEL_VERSION 3 |
| 74 | 74 | |
| 75 | +extern int mdp_major; | |
| 76 | + | |
| 75 | 77 | extern int register_md_personality (struct mdk_personality *p); |
| 76 | 78 | extern int unregister_md_personality (struct mdk_personality *p); |
| 77 | 79 | extern mdk_thread_t * md_register_thread (void (*run) (mddev_t *mddev), |
| @@ -180,13 +180,15 @@ struct mddev_s · 179 unmodified lines | ||
| 180 | 180 | int sync_speed_min; |
| 181 | 181 | int sync_speed_max; |
| 182 | 182 | |
| 183 | + /* resync even though the same disks are shared among md-devices */ | |
| 184 | + int parallel_resync; | |
| 185 | + | |
| 183 | 186 | int ok_start_degraded; |
| 184 | 187 | /* recovery/resync flags |
| 185 | 188 | * NEEDED: we might need to start a resync/recover |
| 186 | 189 | * RUNNING: a thread is running, or about to be started |
| 187 | 190 | * SYNC: actually doing a resync, not a recovery |
| 188 | − * ERR: and IO error was detected - abort the resync/recovery | |
| 189 | − * INTR: someone requested a (clean) early abort. | |
| 191 | + * INTR: resync needs to be aborted for some reason | |
| 190 | 192 | * DONE: thread is done and is waiting to be reaped |
| 191 | 193 | * REQUEST: user-space has requested a sync (used with SYNC) |
| 192 | 194 | * CHECK: user-space request for for check-only, no repair |
| @@ -196,7 +198,6 @@ struct mddev_s · 3 unmodified lines | ||
| 196 | 198 | */ |
| 197 | 199 | #define MD_RECOVERY_RUNNING 0 |
| 198 | 200 | #define MD_RECOVERY_SYNC 1 |
| 199 | −#define MD_RECOVERY_ERR 2 | |
| 200 | 201 | #define MD_RECOVERY_INTR 3 |
| 201 | 202 | #define MD_RECOVERY_DONE 4 |
| 202 | 203 | #define MD_RECOVERY_NEEDED 5 |
| @@ -1847,7 +1847,9 @@ extern void exit_thread(void); · 1846 unmodified lines | ||
| 1847 | 1847 | extern void exit_files(struct task_struct *); |
| 1848 | 1848 | extern void __cleanup_signal(struct signal_struct *); |
| 1849 | 1849 | extern void __cleanup_sighand(struct sighand_struct *); |
| 1850 | + | |
| 1850 | 1851 | extern void exit_itimers(struct signal_struct *); |
| 1852 | +extern void flush_itimer_signals(void); | |
| 1851 | 1853 | |
| 1852 | 1854 | extern NORET_TYPE void do_group_exit(int); |
| 1853 | 1855 | |
| @@ -71,8 +71,8 @@ extern unsigned long sm501_gpio_get(struct device *dev, · 70 unmodified lines | ||
| 71 | 71 | #define SM501FB_FLAG_DISABLE_AT_EXIT (1<<1) |
| 72 | 72 | #define SM501FB_FLAG_USE_HWCURSOR (1<<2) |
| 73 | 73 | #define SM501FB_FLAG_USE_HWACCEL (1<<3) |
| 74 | −#define SM501FB_FLAG_PANEL_USE_FPEN (1<<4) | |
| 75 | −#define SM501FB_FLAG_PANEL_USE_VBIASEN (1<<5) | |
| 74 | +#define SM501FB_FLAG_PANEL_NO_FPEN (1<<4) | |
| 75 | +#define SM501FB_FLAG_PANEL_NO_VBIASEN (1<<5) | |
| 76 | 76 | |
| 77 | 77 | struct sm501_platdata_fbsub { |
| 78 | 78 | struct fb_videomode *def_mode; |
| @@ -71,7 +71,8 @@ extern atomic_t rdma_stat_sq_prod; · 70 unmodified lines | ||
| 71 | 71 | * completes. |
| 72 | 72 | */ |
| 73 | 73 | struct svc_rdma_op_ctxt { |
| 74 | − struct svc_rdma_op_ctxt *next; | |
| 74 | + struct svc_rdma_op_ctxt *read_hdr; | |
| 75 | + struct list_head free_list; | |
| 75 | 76 | struct xdr_buf arg; |
| 76 | 77 | struct list_head dto_q; |
| 77 | 78 | enum ib_wr_opcode wr_op; |
| @@ -85,7 +86,6 @@ struct svc_rdma_op_ctxt { · 7 unmodified lines | ||
| 85 | 86 | struct page *pages[RPCSVC_MAXPAGES]; |
| 86 | 87 | }; |
| 87 | 88 | |
| 88 | −#define RDMACTXT_F_READ_DONE 1 | |
| 89 | 89 | #define RDMACTXT_F_LAST_CTXT 2 |
| 90 | 90 | |
| 91 | 91 | struct svcxprt_rdma { |
| @@ -104,7 +104,8 @@ struct svcxprt_rdma { · 12 unmodified lines | ||
| 104 | 104 | |
| 105 | 105 | struct ib_pd *sc_pd; |
| 106 | 106 | |
| 107 | − struct svc_rdma_op_ctxt *sc_ctxt_head; | |
| 107 | + atomic_t sc_ctxt_used; | |
| 108 | + struct list_head sc_ctxt_free; | |
| 108 | 109 | int sc_ctxt_cnt; |
| 109 | 110 | int sc_ctxt_bump; |
| 110 | 111 | int sc_ctxt_max; |
| @@ -123,6 +124,7 @@ struct svcxprt_rdma { · 12 unmodified lines | ||
| 123 | 124 | struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */ |
| 124 | 125 | struct list_head sc_read_complete_q; |
| 125 | 126 | spinlock_t sc_read_complete_lock; |
| 127 | + struct work_struct sc_work; | |
| 126 | 128 | }; |
| 127 | 129 | /* sc_flags */ |
| 128 | 130 | #define RDMAXPRT_RQ_PENDING 1 |
| @@ -164,8 +166,8 @@ extern int svc_rdma_sendto(struct svc_rqst *); · 35 unmodified lines | ||
| 164 | 166 | |
| 165 | 167 | /* svc_rdma_transport.c */ |
| 166 | 168 | extern int svc_rdma_send(struct svcxprt_rdma *, struct ib_send_wr *); |
| 167 | −extern int svc_rdma_send_error(struct svcxprt_rdma *, struct rpcrdma_msg *, | |
| 168 | − enum rpcrdma_errcode); | |
| 169 | +extern void svc_rdma_send_error(struct svcxprt_rdma *, struct rpcrdma_msg *, | |
| 170 | + enum rpcrdma_errcode); | |
| 169 | 171 | struct page *svc_rdma_get_page(void); |
| 170 | 172 | extern int svc_rdma_post_recv(struct svcxprt_rdma *); |
| 171 | 173 | extern int svc_rdma_create_listen(struct svc_serv *, int, struct sockaddr *); |
| @@ -355,7 +355,7 @@ struct tcp_sock { · 354 unmodified lines | ||
| 355 | 355 | u32 lost_retrans_low; /* Sent seq after any rxmit (lowest) */ |
| 356 | 356 | |
| 357 | 357 | u16 advmss; /* Advertised MSS */ |
| 358 | − u16 prior_ssthresh; /* ssthresh saved at recovery start */ | |
| 358 | + u32 prior_ssthresh; /* ssthresh saved at recovery start */ | |
| 359 | 359 | u32 lost_out; /* Lost packets */ |
| 360 | 360 | u32 sacked_out; /* SACK'd packets */ |
| 361 | 361 | u32 fackets_out; /* FACK'd packets */ |
| @@ -197,8 +197,6 @@ typedef u64 resource_size_t; · 196 unmodified lines | ||
| 197 | 197 | typedef u32 resource_size_t; |
| 198 | 198 | #endif |
| 199 | 199 | |
| 200 | −#endif /* __KERNEL__ */ | |
| 201 | − | |
| 202 | 200 | struct ustat { |
| 203 | 201 | __kernel_daddr_t f_tfree; |
| 204 | 202 | __kernel_ino_t f_tinode; |
| @@ -206,4 +204,6 @@ struct ustat { · 1 unmodified line | ||
| 206 | 204 | char f_fpack[6]; |
| 207 | 205 | }; |
| 208 | 206 | |
| 207 | +#endif /* __KERNEL__ */ | |
| 208 | + | |
| 209 | 209 | #endif /* _LINUX_TYPES_H */ |
| @@ -130,6 +130,15 @@ struct usb_cdc_ether_desc { · 129 unmodified lines | ||
| 130 | 130 | __u8 bNumberPowerFilters; |
| 131 | 131 | } __attribute__ ((packed)); |
| 132 | 132 | |
| 133 | +/* "Telephone Control Model Functional Descriptor" from CDC WMC spec 6.3..3 */ | |
| 134 | +struct usb_cdc_dmm_desc { | |
| 135 | + __u8 bFunctionLength; | |
| 136 | + __u8 bDescriptorType; | |
| 137 | + __u8 bDescriptorSubtype; | |
| 138 | + __u16 bcdVersion; | |
| 139 | + __le16 wMaxCommand; | |
| 140 | +} __attribute__ ((packed)); | |
| 141 | + | |
| 133 | 142 | /* "MDLM Functional Descriptor" from CDC WMC spec 6.7.2.3 */ |
| 134 | 143 | struct usb_cdc_mdlm_desc { |
| 135 | 144 | __u8 bLength; |