History

Merge commit 'linus/master' into sched-fixes-for-linus

Ingo Molnar committed 18 years ago

Commit 67159302 parents ea3f01f e490517877 files · +12739 −7306Browse files

Showing the changes to include/linux (31 of 877 files). Show all

Unified · Split

31 files
  1. include/linux/Kbuild +2 −2
  2. include/linux/atm.h +2 −5
  3. include/linux/atm_tcp.h +5 −7
  4. include/linux/binfmts.h +1 −0
  5. include/linux/device.h +12 −0
  6. include/linux/fdtable.h +1 −0
  7. include/linux/gpio.h +3 −0
  8. include/linux/hid.h +1 −2
  9. include/linux/hiddev.h +0 −2
  10. include/linux/i2c.h +1 −6
  11. include/linux/i2c/pcf857x.h +1 −2
  12. include/linux/init_task.h +1 −22
  13. include/linux/libata.h +2 −4
  14. include/linux/mman.h +2 −2
  15. include/linux/mmzone.h +1 −1
  16. include/linux/mod_devicetable.h +2 −1
  17. include/linux/netdevice.h +3 −0
  18. include/linux/netfilter.h +1 −1
  19. include/linux/netfilter_arp/arp_tables.h +1 −1
  20. include/linux/netfilter_ipv4/ip_tables.h +1 −1
  21. include/linux/netfilter_ipv6/ip6_tables.h +1 −1
  22. include/linux/pci_ids.h +4 −0
  23. include/linux/raid/bitmap.h +0 −1
  24. include/linux/raid/md.h +2 −0
  25. include/linux/raid/md_k.h +4 −3
  26. include/linux/sched.h +2 −0
  27. include/linux/sm501.h +2 −2
  28. include/linux/sunrpc/svc_rdma.h +7 −5
  29. include/linux/tcp.h +1 −1
  30. include/linux/types.h +2 −2
  31. include/linux/usb/cdc.h +9 −0
include/linux/Kbuild+2−2
@@ -92,7 +92,6 @@ header-y += if_slip.h · 91 unmodified lines
92header-y += if_strip.h92header-y += if_strip.h
93header-y += if_tun.h93header-y += if_tun.h
94header-y += if_tunnel.h94header-y += if_tunnel.h
95header-y += in6.h
96header-y += in_route.h95header-y += in_route.h
97header-y += ioctl.h96header-y += ioctl.h
98header-y += ip6_tunnel.h97header-y += ip6_tunnel.h
@@ -105,7 +104,6 @@ header-y += ixjuser.h · 6 unmodified lines
105header-y += jffs2.h104header-y += jffs2.h
106header-y += keyctl.h105header-y += keyctl.h
107header-y += limits.h106header-y += limits.h
108header-y += dlm_plock.h
109header-y += magic.h107header-y += magic.h
110header-y += major.h108header-y += major.h
111header-y += matroxfb.h109header-y += matroxfb.h
@@ -190,6 +188,7 @@ unifdef-y += cyclades.h · 78 unmodified lines
190unifdef-y += dccp.h188unifdef-y += dccp.h
191unifdef-y += dirent.h189unifdef-y += dirent.h
192unifdef-y += dlm.h190unifdef-y += dlm.h
191unifdef-y += dlm_plock.h
193unifdef-y += edd.h192unifdef-y += edd.h
194unifdef-y += elf.h193unifdef-y += elf.h
195unifdef-y += elfcore.h194unifdef-y += elfcore.h
@@ -236,6 +235,7 @@ unifdef-y += if_vlan.h · 40 unmodified lines
236unifdef-y += igmp.h235unifdef-y += igmp.h
237unifdef-y += inet_diag.h236unifdef-y += inet_diag.h
238unifdef-y += in.h237unifdef-y += in.h
238unifdef-y += in6.h
239unifdef-y += inotify.h239unifdef-y += inotify.h
240unifdef-y += input.h240unifdef-y += input.h
241unifdef-y += ip.h241unifdef-y += ip.h
include/linux/atm.h+2−5
@@ -16,14 +16,11 @@ · 15 unmodified lines
16 * documentation. Do not change them.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#include <linux/compiler.h>19#include <linux/compiler.h>
24#include <linux/atmapi.h>20#include <linux/atmapi.h>
25#include <linux/atmsap.h>21#include <linux/atmsap.h>
26#include <linux/atmioc.h>22#include <linux/atmioc.h>
23#include <linux/types.h>
27 24
28 25
29/* general ATM constants */26/* general ATM constants */
@@ -212,7 +209,7 @@ struct sockaddr_atmsvc { · 182 unmodified lines
212 char pub[ATM_E164_LEN+1]; /* public address (E.164) */209 char pub[ATM_E164_LEN+1]; /* public address (E.164) */
213 /* unused addresses must be bzero'ed */210 /* unused addresses must be bzero'ed */
214 char lij_type; /* role in LIJ call; one of ATM_LIJ* */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 } sas_addr __ATM_API_ALIGN; /* SVC address */213 } sas_addr __ATM_API_ALIGN; /* SVC address */
217};214};
218 215
include/linux/atm_tcp.h+5−7
@@ -8,11 +8,9 @@ · 7 unmodified lines
8#define LINUX_ATM_TCP_H8#define LINUX_ATM_TCP_H
9 9
10#include <linux/atmapi.h>10#include <linux/atmapi.h>
11 11#include <linux/atm.h>
12#ifdef __KERNEL__
13#include <linux/types.h>
14#endif
15#include <linux/atmioc.h>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
22struct atmtcp_hdr {20struct atmtcp_hdr {
23 uint16_t vpi;21 __u16 vpi;
24 uint16_t vci;22 __u16 vci;
25 uint32_t length; /* ... of data part */23 __u32 length; /* ... of data part */
26};24};
27 25
28/*26/*
include/linux/binfmts.h+1−0
@@ -99,6 +99,7 @@ extern int copy_strings_kernel(int argc,char ** argv,struct linux_binprm *bprm); · 98 unmodified lines
99extern void compute_creds(struct linux_binprm *binprm);99extern void compute_creds(struct linux_binprm *binprm);
100extern int do_coredump(long signr, int exit_code, struct pt_regs * regs);100extern int do_coredump(long signr, int exit_code, struct pt_regs * regs);
101extern int set_binfmt(struct linux_binfmt *new);101extern int set_binfmt(struct linux_binfmt *new);
102extern void free_bprm(struct linux_binprm *);
102 103
103#endif /* __KERNEL__ */104#endif /* __KERNEL__ */
104#endif /* _LINUX_BINFMTS_H */105#endif /* _LINUX_BINFMTS_H */
include/linux/device.h+12−0
@@ -449,9 +449,21 @@ extern int __must_check device_reprobe(struct device *dev); · 448 unmodified lines
449/*449/*
450 * Easy functions for dynamically creating devices on the fly450 * Easy functions for dynamically creating devices on the fly
451 */451 */
452extern 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);
452extern struct device *device_create(struct class *cls, struct device *parent,458extern struct device *device_create(struct class *cls, struct device *parent,
453 dev_t devt, const char *fmt, ...)459 dev_t devt, const char *fmt, ...)
454 __attribute__((format(printf, 4, 5)));460 __attribute__((format(printf, 4, 5)));
461extern 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)));
455extern void device_destroy(struct class *cls, dev_t devt);467extern void device_destroy(struct class *cls, dev_t devt);
456 468
457/*469/*
include/linux/fdtable.h+1−0
@@ -93,6 +93,7 @@ struct files_struct *get_files_struct(struct task_struct *); · 92 unmodified lines
93void put_files_struct(struct files_struct *fs);93void put_files_struct(struct files_struct *fs);
94void reset_files_struct(struct files_struct *);94void reset_files_struct(struct files_struct *);
95int unshare_files(struct files_struct **);95int unshare_files(struct files_struct **);
96struct files_struct *dup_fd(struct files_struct *, int *);
96 97
97extern struct kmem_cache *files_cachep;98extern struct kmem_cache *files_cachep;
98 99
include/linux/gpio.h+3−0
@@ -8,6 +8,9 @@ · 7 unmodified lines
8 8
9#else9#else
10 10
11#include <linux/types.h>
12#include <linux/errno.h>
13
11/*14/*
12 * Some platforms don't support the GPIO programming interface.15 * Some platforms don't support the GPIO programming interface.
13 *16 *
include/linux/hid.h+1−2
@@ -2,8 +2,6 @@ · 1 unmodified line
2#define __HID_H2#define __HID_H
3 3
4/*4/*
5 * $Id: hid.h,v 1.24 2001/12/27 10:37:41 vojtech Exp $
6 *
7 * Copyright (c) 1999 Andreas Gal5 * Copyright (c) 1999 Andreas Gal
8 * Copyright (c) 2000-2001 Vojtech Pavlik6 * Copyright (c) 2000-2001 Vojtech Pavlik
9 * Copyright (c) 2006-2007 Jiri Kosina7 * Copyright (c) 2006-2007 Jiri Kosina
@@ -285,6 +283,7 @@ struct hid_item { · 275 unmodified lines
285#define HID_QUIRK_HWHEEL_WHEEL_INVERT 0x04000000283#define HID_QUIRK_HWHEEL_WHEEL_INVERT 0x04000000
286#define HID_QUIRK_MICROSOFT_KEYS 0x08000000284#define HID_QUIRK_MICROSOFT_KEYS 0x08000000
287#define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000285#define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000
286#define HID_QUIRK_APPLE_NUMLOCK_EMULATION 0x20000000
288 287
289/*288/*
290 * Separate quirks for runtime report descriptor fixup289 * Separate quirks for runtime report descriptor fixup
include/linux/hiddev.h+0−2
@@ -2,8 +2,6 @@ · 1 unmodified line
2#define _HIDDEV_H2#define _HIDDEV_H
3 3
4/*4/*
5 * $Id: hiddev.h,v 1.2 2001/04/26 11:26:09 vojtech Exp $
6 *
7 * Copyright (c) 1999-2000 Vojtech Pavlik5 * Copyright (c) 1999-2000 Vojtech Pavlik
8 *6 *
9 * Sponsored by SuSE7 * Sponsored by SuSE
include/linux/i2c.h+1−6
@@ -155,8 +155,6 @@ struct i2c_driver { · 154 unmodified lines
155 * @driver: device's driver, hence pointer to access routines155 * @driver: device's driver, hence pointer to access routines
156 * @dev: Driver model device node for the slave.156 * @dev: Driver model device node for the slave.
157 * @irq: indicates the IRQ generated by this device (if any)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 * @list: list of active/busy clients (DEPRECATED)158 * @list: list of active/busy clients (DEPRECATED)
161 * @released: used to synchronize client releases & detaches and references159 * @released: used to synchronize client releases & detaches and references
162 *160 *
@@ -174,7 +172,6 @@ struct i2c_client { · 11 unmodified lines
174 struct i2c_driver *driver; /* and our access routines */172 struct i2c_driver *driver; /* and our access routines */
175 struct device dev; /* the device structure */173 struct device dev; /* the device structure */
176 int irq; /* irq issued by device (or -1) */174 int irq; /* irq issued by device (or -1) */
177 char driver_name[KOBJ_NAME_LEN];
178 struct list_head list; /* DEPRECATED */175 struct list_head list; /* DEPRECATED */
179 struct completion released;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 * struct i2c_board_info - template for device creation199 * struct i2c_board_info - template for device creation
203 * @driver_name: identifies the driver to be bound to the device200 * @type: chip type, to initialize i2c_client.name
204 * @type: optional chip type information, to initialize i2c_client.name
205 * @flags: to initialize i2c_client.flags201 * @flags: to initialize i2c_client.flags
206 * @addr: stored in i2c_client.addr202 * @addr: stored in i2c_client.addr
207 * @platform_data: stored in i2c_client.dev.platform_data203 * @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 * with the adapter already known.216 * with the adapter already known.
221 */217 */
222struct i2c_board_info {218struct i2c_board_info {
223 char driver_name[KOBJ_NAME_LEN];
224 char type[I2C_NAME_SIZE];219 char type[I2C_NAME_SIZE];
225 unsigned short flags;220 unsigned short flags;
226 unsigned short addr;221 unsigned short addr;
include/linux/i2c/pcf857x.h+1−2
@@ -12,8 +12,7 @@ · 11 unmodified lines
12 * @context: optional parameter passed to setup() and teardown()12 * @context: optional parameter passed to setup() and teardown()
13 *13 *
14 * In addition to the I2C_BOARD_INFO() state appropriate to each chip,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 the15 * the i2c_board_info used with the pcf875x driver must provide its
16 * chip "type" ("pcf8574", "pcf8574a", "pcf8575", "pcf8575c") and its
17 * platform_data (pointer to one of these structures) with at least16 * platform_data (pointer to one of these structures) with at least
18 * the gpio_base value initialized.17 * the gpio_base value initialized.
19 *18 *
include/linux/init_task.h+1−22
@@ -1,7 +1,6 @@
1#ifndef _LINUX__INIT_TASK_H1#ifndef _LINUX__INIT_TASK_H
2#define _LINUX__INIT_TASK_H2#define _LINUX__INIT_TASK_H
3 3
4#include <linux/fdtable.h>
5#include <linux/rcupdate.h>4#include <linux/rcupdate.h>
6#include <linux/irqflags.h>5#include <linux/irqflags.h>
7#include <linux/utsname.h>6#include <linux/utsname.h>
@@ -12,27 +11,7 @@ · 4 unmodified lines
12#include <linux/securebits.h>11#include <linux/securebits.h>
13#include <net/net_namespace.h>12#include <net/net_namespace.h>
14 13
15#define INIT_FDTABLE \14extern struct files_struct init_files;
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}
36 15
37#define INIT_KIOCTX(name, which_mm) \16#define INIT_KIOCTX(name, which_mm) \
38{ \17{ \
include/linux/libata.h+2−4
@@ -341,7 +341,7 @@ enum { · 340 unmodified lines
341 ATA_EH_PMP_TRIES = 5,341 ATA_EH_PMP_TRIES = 5,
342 ATA_EH_PMP_LINK_TRIES = 3,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 /* Horkage types. May be set by libata or controller on drives346 /* Horkage types. May be set by libata or controller on drives
347 (some horkage may be drive/controller pair dependant */347 (some horkage may be drive/controller pair dependant */
@@ -351,7 +351,7 @@ enum { · 3 unmodified lines
351 ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */351 ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */
352 ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */352 ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */
353 ATA_HORKAGE_BROKEN_HPA = (1 << 4), /* Broken HPA */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 ATA_HORKAGE_HPA_SIZE = (1 << 6), /* native size off by one */355 ATA_HORKAGE_HPA_SIZE = (1 << 6), /* native size off by one */
356 ATA_HORKAGE_IPM = (1 << 7), /* Link PM problems */356 ATA_HORKAGE_IPM = (1 << 7), /* Link PM problems */
357 ATA_HORKAGE_IVB = (1 << 8), /* cbl det validity bit bugs */357 ATA_HORKAGE_IVB = (1 << 8), /* cbl det validity bit bugs */
@@ -821,8 +821,6 @@ struct ata_timing { · 463 unmodified lines
821 unsigned short udma; /* t2CYCTYP/2 */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 * Core layer - drivers/ata/libata-core.c825 * Core layer - drivers/ata/libata-core.c
828 */826 */
include/linux/mman.h+2−2
@@ -17,14 +17,14 @@ · 16 unmodified lines
17 17
18extern int sysctl_overcommit_memory;18extern int sysctl_overcommit_memory;
19extern int sysctl_overcommit_ratio;19extern int sysctl_overcommit_ratio;
20extern atomic_t vm_committed_space;20extern atomic_long_t vm_committed_space;
21 21
22#ifdef CONFIG_SMP22#ifdef CONFIG_SMP
23extern void vm_acct_memory(long pages);23extern void vm_acct_memory(long pages);
24#else24#else
25static inline void vm_acct_memory(long pages)25static 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#endif29#endif
30 30
include/linux/mmzone.h+1−1
@@ -703,7 +703,7 @@ extern struct pglist_data *next_online_pgdat(struct pglist_data *pgdat); · 702 unmodified lines
703extern struct zone *next_zone(struct zone *zone);703extern struct zone *next_zone(struct zone *zone);
704 704
705/**705/**
706 * for_each_pgdat - helper macro to iterate over all nodes706 * for_each_online_pgdat - helper macro to iterate over all online nodes
707 * @pgdat - pointer to a pg_data_t variable707 * @pgdat - pointer to a pg_data_t variable
708 */708 */
709#define for_each_online_pgdat(pgdat) \709#define for_each_online_pgdat(pgdat) \
include/linux/mod_devicetable.h+2−1
@@ -375,7 +375,8 @@ struct virtio_device_id { · 374 unmodified lines
375 375
376struct i2c_device_id {376struct i2c_device_id {
377 char name[I2C_NAME_SIZE];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
include/linux/netdevice.h+3−0
@@ -745,6 +745,9 @@ struct net_device · 744 unmodified lines
745 /* rtnetlink link ops */745 /* rtnetlink link ops */
746 const struct rtnl_link_ops *rtnl_link_ops;746 const struct rtnl_link_ops *rtnl_link_ops;
747 747
748 /* VLAN feature mask */
749 unsigned long vlan_features;
750
748 /* for setting kernel sock attribute on TCP connection setup */751 /* for setting kernel sock attribute on TCP connection setup */
749#define GSO_MAX_SIZE 65536752#define GSO_MAX_SIZE 65536
750 unsigned int gso_max_size;753 unsigned int gso_max_size;
include/linux/netfilter.h+1−1
@@ -3,7 +3,6 @@ · 2 unmodified lines
3 3
4#ifdef __KERNEL__4#ifdef __KERNEL__
5#include <linux/init.h>5#include <linux/init.h>
6#include <linux/types.h>
7#include <linux/skbuff.h>6#include <linux/skbuff.h>
8#include <linux/net.h>7#include <linux/net.h>
9#include <linux/netdevice.h>8#include <linux/netdevice.h>
@@ -14,6 +13,7 @@ · 4 unmodified lines
14#include <linux/list.h>13#include <linux/list.h>
15#include <net/net_namespace.h>14#include <net/net_namespace.h>
16#endif15#endif
16#include <linux/types.h>
17#include <linux/compiler.h>17#include <linux/compiler.h>
18 18
19/* Responses from hook functions. */19/* Responses from hook functions. */
include/linux/netfilter_arp/arp_tables.h+1−1
@@ -11,11 +11,11 @@ · 10 unmodified lines
11 11
12#ifdef __KERNEL__12#ifdef __KERNEL__
13#include <linux/if.h>13#include <linux/if.h>
14#include <linux/types.h>
15#include <linux/in.h>14#include <linux/in.h>
16#include <linux/if_arp.h>15#include <linux/if_arp.h>
17#include <linux/skbuff.h>16#include <linux/skbuff.h>
18#endif17#endif
18#include <linux/types.h>
19#include <linux/compiler.h>19#include <linux/compiler.h>
20#include <linux/netfilter_arp.h>20#include <linux/netfilter_arp.h>
21 21
include/linux/netfilter_ipv4/ip_tables.h+1−1
@@ -17,11 +17,11 @@ · 16 unmodified lines
17 17
18#ifdef __KERNEL__18#ifdef __KERNEL__
19#include <linux/if.h>19#include <linux/if.h>
20#include <linux/types.h>
21#include <linux/in.h>20#include <linux/in.h>
22#include <linux/ip.h>21#include <linux/ip.h>
23#include <linux/skbuff.h>22#include <linux/skbuff.h>
24#endif23#endif
24#include <linux/types.h>
25#include <linux/compiler.h>25#include <linux/compiler.h>
26#include <linux/netfilter_ipv4.h>26#include <linux/netfilter_ipv4.h>
27 27
include/linux/netfilter_ipv6/ip6_tables.h+1−1
@@ -17,11 +17,11 @@ · 16 unmodified lines
17 17
18#ifdef __KERNEL__18#ifdef __KERNEL__
19#include <linux/if.h>19#include <linux/if.h>
20#include <linux/types.h>
21#include <linux/in6.h>20#include <linux/in6.h>
22#include <linux/ipv6.h>21#include <linux/ipv6.h>
23#include <linux/skbuff.h>22#include <linux/skbuff.h>
24#endif23#endif
24#include <linux/types.h>
25#include <linux/compiler.h>25#include <linux/compiler.h>
26#include <linux/netfilter_ipv6.h>26#include <linux/netfilter_ipv6.h>
27 27
include/linux/pci_ids.h+4−0
@@ -1761,6 +1761,7 @@ · 1760 unmodified lines
1761 1761
1762#define PCI_VENDOR_ID_INTASHIELD 0x135a1762#define PCI_VENDOR_ID_INTASHIELD 0x135a
1763#define PCI_DEVICE_ID_INTASHIELD_IS200 0x0d801763#define PCI_DEVICE_ID_INTASHIELD_IS200 0x0d80
1764#define PCI_DEVICE_ID_INTASHIELD_IS400 0x0dc0
1764 1765
1765#define PCI_VENDOR_ID_QUATECH 0x135C1766#define PCI_VENDOR_ID_QUATECH 0x135C
1766#define PCI_DEVICE_ID_QUATECH_QSC100 0x00101767#define PCI_DEVICE_ID_QUATECH_QSC100 0x0010
@@ -2383,6 +2384,9 @@ · 616 unmodified lines
2383#define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a302384#define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30
2384#define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a602385#define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60
2385#define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f2386#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#define PCI_DEVICE_ID_INTEL_IOAT_SCNB 0x65ff2390#define PCI_DEVICE_ID_INTEL_IOAT_SCNB 0x65ff
2387#define PCI_DEVICE_ID_INTEL_TOLAPAI_0 0x50312391#define PCI_DEVICE_ID_INTEL_TOLAPAI_0 0x5031
2388#define PCI_DEVICE_ID_INTEL_TOLAPAI_1 0x50322392#define PCI_DEVICE_ID_INTEL_TOLAPAI_1 0x5032
include/linux/raid/bitmap.h+0−1
@@ -262,7 +262,6 @@ int bitmap_create(mddev_t *mddev); · 261 unmodified lines
262void bitmap_flush(mddev_t *mddev);262void bitmap_flush(mddev_t *mddev);
263void bitmap_destroy(mddev_t *mddev);263void bitmap_destroy(mddev_t *mddev);
264 264
265char *file_path(struct file *file, char *buf, int count);
266void bitmap_print_sb(struct bitmap *bitmap);265void bitmap_print_sb(struct bitmap *bitmap);
267void bitmap_update_sb(struct bitmap *bitmap);266void bitmap_update_sb(struct bitmap *bitmap);
268 267
include/linux/raid/md.h+2−0
@@ -72,6 +72,8 @@ · 71 unmodified lines
72 */72 */
73#define MD_PATCHLEVEL_VERSION 373#define MD_PATCHLEVEL_VERSION 3
74 74
75extern int mdp_major;
76
75extern int register_md_personality (struct mdk_personality *p);77extern int register_md_personality (struct mdk_personality *p);
76extern int unregister_md_personality (struct mdk_personality *p);78extern int unregister_md_personality (struct mdk_personality *p);
77extern mdk_thread_t * md_register_thread (void (*run) (mddev_t *mddev),79extern mdk_thread_t * md_register_thread (void (*run) (mddev_t *mddev),
include/linux/raid/md_k.h+4−3
@@ -180,13 +180,15 @@ struct mddev_s · 179 unmodified lines
180 int sync_speed_min;180 int sync_speed_min;
181 int sync_speed_max;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 int ok_start_degraded;186 int ok_start_degraded;
184 /* recovery/resync flags 187 /* recovery/resync flags
185 * NEEDED: we might need to start a resync/recover188 * NEEDED: we might need to start a resync/recover
186 * RUNNING: a thread is running, or about to be started189 * RUNNING: a thread is running, or about to be started
187 * SYNC: actually doing a resync, not a recovery190 * SYNC: actually doing a resync, not a recovery
188 * ERR: and IO error was detected - abort the resync/recovery191 * INTR: resync needs to be aborted for some reason
189 * INTR: someone requested a (clean) early abort.
190 * DONE: thread is done and is waiting to be reaped192 * DONE: thread is done and is waiting to be reaped
191 * REQUEST: user-space has requested a sync (used with SYNC)193 * REQUEST: user-space has requested a sync (used with SYNC)
192 * CHECK: user-space request for for check-only, no repair194 * CHECK: user-space request for for check-only, no repair
@@ -196,7 +198,6 @@ struct mddev_s · 3 unmodified lines
196 */198 */
197#define MD_RECOVERY_RUNNING 0199#define MD_RECOVERY_RUNNING 0
198#define MD_RECOVERY_SYNC 1200#define MD_RECOVERY_SYNC 1
199#define MD_RECOVERY_ERR 2
200#define MD_RECOVERY_INTR 3201#define MD_RECOVERY_INTR 3
201#define MD_RECOVERY_DONE 4202#define MD_RECOVERY_DONE 4
202#define MD_RECOVERY_NEEDED 5203#define MD_RECOVERY_NEEDED 5
include/linux/sched.h+2−0
@@ -1847,7 +1847,9 @@ extern void exit_thread(void); · 1846 unmodified lines
1847extern void exit_files(struct task_struct *);1847extern void exit_files(struct task_struct *);
1848extern void __cleanup_signal(struct signal_struct *);1848extern void __cleanup_signal(struct signal_struct *);
1849extern void __cleanup_sighand(struct sighand_struct *);1849extern void __cleanup_sighand(struct sighand_struct *);
1850
1850extern void exit_itimers(struct signal_struct *);1851extern void exit_itimers(struct signal_struct *);
1852extern void flush_itimer_signals(void);
1851 1853
1852extern NORET_TYPE void do_group_exit(int);1854extern NORET_TYPE void do_group_exit(int);
1853 1855
include/linux/sm501.h+2−2
@@ -71,8 +71,8 @@ extern unsigned long sm501_gpio_get(struct device *dev, · 70 unmodified lines
71#define SM501FB_FLAG_DISABLE_AT_EXIT (1<<1)71#define SM501FB_FLAG_DISABLE_AT_EXIT (1<<1)
72#define SM501FB_FLAG_USE_HWCURSOR (1<<2)72#define SM501FB_FLAG_USE_HWCURSOR (1<<2)
73#define SM501FB_FLAG_USE_HWACCEL (1<<3)73#define SM501FB_FLAG_USE_HWACCEL (1<<3)
74#define SM501FB_FLAG_PANEL_USE_FPEN (1<<4)74#define SM501FB_FLAG_PANEL_NO_FPEN (1<<4)
75#define SM501FB_FLAG_PANEL_USE_VBIASEN (1<<5)75#define SM501FB_FLAG_PANEL_NO_VBIASEN (1<<5)
76 76
77struct sm501_platdata_fbsub {77struct sm501_platdata_fbsub {
78 struct fb_videomode *def_mode;78 struct fb_videomode *def_mode;
include/linux/sunrpc/svc_rdma.h+7−5
@@ -71,7 +71,8 @@ extern atomic_t rdma_stat_sq_prod; · 70 unmodified lines
71 * completes.71 * completes.
72 */72 */
73struct svc_rdma_op_ctxt {73struct 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 struct xdr_buf arg;76 struct xdr_buf arg;
76 struct list_head dto_q;77 struct list_head dto_q;
77 enum ib_wr_opcode wr_op;78 enum ib_wr_opcode wr_op;
@@ -85,7 +86,6 @@ struct svc_rdma_op_ctxt { · 7 unmodified lines
85 struct page *pages[RPCSVC_MAXPAGES];86 struct page *pages[RPCSVC_MAXPAGES];
86};87};
87 88
88#define RDMACTXT_F_READ_DONE 1
89#define RDMACTXT_F_LAST_CTXT 289#define RDMACTXT_F_LAST_CTXT 2
90 90
91struct svcxprt_rdma {91struct svcxprt_rdma {
@@ -104,7 +104,8 @@ struct svcxprt_rdma { · 12 unmodified lines
104 104
105 struct ib_pd *sc_pd;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 int sc_ctxt_cnt;109 int sc_ctxt_cnt;
109 int sc_ctxt_bump;110 int sc_ctxt_bump;
110 int sc_ctxt_max;111 int sc_ctxt_max;
@@ -123,6 +124,7 @@ struct svcxprt_rdma { · 12 unmodified lines
123 struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */124 struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */
124 struct list_head sc_read_complete_q;125 struct list_head sc_read_complete_q;
125 spinlock_t sc_read_complete_lock;126 spinlock_t sc_read_complete_lock;
127 struct work_struct sc_work;
126};128};
127/* sc_flags */129/* sc_flags */
128#define RDMAXPRT_RQ_PENDING 1130#define RDMAXPRT_RQ_PENDING 1
@@ -164,8 +166,8 @@ extern int svc_rdma_sendto(struct svc_rqst *); · 35 unmodified lines
164 166
165/* svc_rdma_transport.c */167/* svc_rdma_transport.c */
166extern int svc_rdma_send(struct svcxprt_rdma *, struct ib_send_wr *);168extern int svc_rdma_send(struct svcxprt_rdma *, struct ib_send_wr *);
167extern int svc_rdma_send_error(struct svcxprt_rdma *, struct rpcrdma_msg *,169extern void svc_rdma_send_error(struct svcxprt_rdma *, struct rpcrdma_msg *,
168 enum rpcrdma_errcode);170 enum rpcrdma_errcode);
169struct page *svc_rdma_get_page(void);171struct page *svc_rdma_get_page(void);
170extern int svc_rdma_post_recv(struct svcxprt_rdma *);172extern int svc_rdma_post_recv(struct svcxprt_rdma *);
171extern int svc_rdma_create_listen(struct svc_serv *, int, struct sockaddr *);173extern int svc_rdma_create_listen(struct svc_serv *, int, struct sockaddr *);
include/linux/tcp.h+1−1
@@ -355,7 +355,7 @@ struct tcp_sock { · 354 unmodified lines
355 u32 lost_retrans_low; /* Sent seq after any rxmit (lowest) */355 u32 lost_retrans_low; /* Sent seq after any rxmit (lowest) */
356 356
357 u16 advmss; /* Advertised MSS */357 u16 advmss; /* Advertised MSS */
358 u16 prior_ssthresh; /* ssthresh saved at recovery start */358 u32 prior_ssthresh; /* ssthresh saved at recovery start */
359 u32 lost_out; /* Lost packets */359 u32 lost_out; /* Lost packets */
360 u32 sacked_out; /* SACK'd packets */360 u32 sacked_out; /* SACK'd packets */
361 u32 fackets_out; /* FACK'd packets */361 u32 fackets_out; /* FACK'd packets */
include/linux/types.h+2−2
@@ -197,8 +197,6 @@ typedef u64 resource_size_t; · 196 unmodified lines
197typedef u32 resource_size_t;197typedef u32 resource_size_t;
198#endif198#endif
199 199
200#endif /* __KERNEL__ */
201
202struct ustat {200struct ustat {
203 __kernel_daddr_t f_tfree;201 __kernel_daddr_t f_tfree;
204 __kernel_ino_t f_tinode;202 __kernel_ino_t f_tinode;
@@ -206,4 +204,6 @@ struct ustat { · 1 unmodified line
206 char f_fpack[6];204 char f_fpack[6];
207};205};
208 206
207#endif /* __KERNEL__ */
208
209#endif /* _LINUX_TYPES_H */209#endif /* _LINUX_TYPES_H */
include/linux/usb/cdc.h+9−0
@@ -130,6 +130,15 @@ struct usb_cdc_ether_desc { · 129 unmodified lines
130 __u8 bNumberPowerFilters;130 __u8 bNumberPowerFilters;
131} __attribute__ ((packed));131} __attribute__ ((packed));
132 132
133/* "Telephone Control Model Functional Descriptor" from CDC WMC spec 6.3..3 */
134struct usb_cdc_dmm_desc {
135 __u8 bFunctionLength;
136 __u8 bDescriptorType;
137 __u8 bDescriptorSubtype;
138 __u16 bcdVersion;
139 __le16 wMaxCommand;
140} __attribute__ ((packed));
141
133/* "MDLM Functional Descriptor" from CDC WMC spec 6.7.2.3 */142/* "MDLM Functional Descriptor" from CDC WMC spec 6.7.2.3 */
134struct usb_cdc_mdlm_desc {143struct usb_cdc_mdlm_desc {
135 __u8 bLength;144 __u8 bLength;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t