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
9292 header-y += if_strip.h
9393 header-y += if_tun.h
9494 header-y += if_tunnel.h
95−header-y += in6.h
9695 header-y += in_route.h
9796 header-y += ioctl.h
9897 header-y += ip6_tunnel.h
@@ -105,7 +104,6 @@ header-y += ixjuser.h · 6 unmodified lines
105104 header-y += jffs2.h
106105 header-y += keyctl.h
107106 header-y += limits.h
108−header-y += dlm_plock.h
109107 header-y += magic.h
110108 header-y += major.h
111109 header-y += matroxfb.h
@@ -190,6 +188,7 @@ unifdef-y += cyclades.h · 78 unmodified lines
190188 unifdef-y += dccp.h
191189 unifdef-y += dirent.h
192190 unifdef-y += dlm.h
191+unifdef-y += dlm_plock.h
193192 unifdef-y += edd.h
194193 unifdef-y += elf.h
195194 unifdef-y += elfcore.h
@@ -236,6 +235,7 @@ unifdef-y += if_vlan.h · 40 unmodified lines
236235 unifdef-y += igmp.h
237236 unifdef-y += inet_diag.h
238237 unifdef-y += in.h
238+unifdef-y += in6.h
239239 unifdef-y += inotify.h
240240 unifdef-y += input.h
241241 unifdef-y += ip.h
include/linux/atm.h+2−5
@@ -16,14 +16,11 @@ · 15 unmodified lines
1616 * documentation. Do not change them.
1717 */
1818
19−#ifdef __KERNEL__
20−#include <linux/socket.h>
21−#include <linux/types.h>
22−#endif
2319 #include <linux/compiler.h>
2420 #include <linux/atmapi.h>
2521 #include <linux/atmsap.h>
2622 #include <linux/atmioc.h>
23+#include <linux/types.h>
2724
2825
2926 /* general ATM constants */
@@ -212,7 +209,7 @@ struct sockaddr_atmsvc { · 182 unmodified lines
212209 char pub[ATM_E164_LEN+1]; /* public address (E.164) */
213210 /* unused addresses must be bzero'ed */
214211 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 */
216213 } sas_addr __ATM_API_ALIGN; /* SVC address */
217214 };
218215
include/linux/atm_tcp.h+5−7
@@ -8,11 +8,9 @@ · 7 unmodified lines
88 #define LINUX_ATM_TCP_H
99
1010 #include <linux/atmapi.h>
11−
12−#ifdef __KERNEL__
13−#include <linux/types.h>
14−#endif
11+#include <linux/atm.h>
1512 #include <linux/atmioc.h>
13+#include <linux/types.h>
1614
1715
1816 /*
@@ -20,9 +18,9 @@ · 1 unmodified line
2018 */
2119
2220 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 */
2624 };
2725
2826 /*
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
9999 extern void compute_creds(struct linux_binprm *binprm);
100100 extern int do_coredump(long signr, int exit_code, struct pt_regs * regs);
101101 extern int set_binfmt(struct linux_binfmt *new);
102+extern void free_bprm(struct linux_binprm *);
102103
103104 #endif /* __KERNEL__ */
104105 #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
449449 /*
450450 * Easy functions for dynamically creating devices on the fly
451451 */
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);
452458 extern struct device *device_create(struct class *cls, struct device *parent,
453459 dev_t devt, const char *fmt, ...)
454460 __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)));
455467 extern void device_destroy(struct class *cls, dev_t devt);
456468
457469 /*
include/linux/fdtable.h+1−0
@@ -93,6 +93,7 @@ struct files_struct *get_files_struct(struct task_struct *); · 92 unmodified lines
9393 void put_files_struct(struct files_struct *fs);
9494 void reset_files_struct(struct files_struct *);
9595 int unshare_files(struct files_struct **);
96+struct files_struct *dup_fd(struct files_struct *, int *);
9697
9798 extern struct kmem_cache *files_cachep;
9899
include/linux/gpio.h+3−0
@@ -8,6 +8,9 @@ · 7 unmodified lines
88
99 #else
1010
11+#include <linux/types.h>
12+#include <linux/errno.h>
13+
1114 /*
1215 * Some platforms don't support the GPIO programming interface.
1316 *
include/linux/hid.h+1−2
@@ -2,8 +2,6 @@ · 1 unmodified line
22 #define __HID_H
33
44 /*
5− * $Id: hid.h,v 1.24 2001/12/27 10:37:41 vojtech Exp $
6− *
75 * Copyright (c) 1999 Andreas Gal
86 * Copyright (c) 2000-2001 Vojtech Pavlik
97 * Copyright (c) 2006-2007 Jiri Kosina
@@ -285,6 +283,7 @@ struct hid_item { · 275 unmodified lines
285283 #define HID_QUIRK_HWHEEL_WHEEL_INVERT 0x04000000
286284 #define HID_QUIRK_MICROSOFT_KEYS 0x08000000
287285 #define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000
286+#define HID_QUIRK_APPLE_NUMLOCK_EMULATION 0x20000000
288287
289288 /*
290289 * Separate quirks for runtime report descriptor fixup
include/linux/hiddev.h+0−2
@@ -2,8 +2,6 @@ · 1 unmodified line
22 #define _HIDDEV_H
33
44 /*
5− * $Id: hiddev.h,v 1.2 2001/04/26 11:26:09 vojtech Exp $
6− *
75 * Copyright (c) 1999-2000 Vojtech Pavlik
86 *
97 * Sponsored by SuSE
include/linux/i2c.h+1−6
@@ -155,8 +155,6 @@ struct i2c_driver { · 154 unmodified lines
155155 * @driver: device's driver, hence pointer to access routines
156156 * @dev: Driver model device node for the slave.
157157 * @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.
160158 * @list: list of active/busy clients (DEPRECATED)
161159 * @released: used to synchronize client releases & detaches and references
162160 *
@@ -174,7 +172,6 @@ struct i2c_client { · 11 unmodified lines
174172 struct i2c_driver *driver; /* and our access routines */
175173 struct device dev; /* the device structure */
176174 int irq; /* irq issued by device (or -1) */
177− char driver_name[KOBJ_NAME_LEN];
178175 struct list_head list; /* DEPRECATED */
179176 struct completion released;
180177 };
@@ -200,8 +197,7 @@ static inline void i2c_set_clientdata (struct i2c_client *dev, void *data) · 19 unmodified lines
200197
201198 /**
202199 * 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
205201 * @flags: to initialize i2c_client.flags
206202 * @addr: stored in i2c_client.addr
207203 * @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
220216 * with the adapter already known.
221217 */
222218 struct i2c_board_info {
223− char driver_name[KOBJ_NAME_LEN];
224219 char type[I2C_NAME_SIZE];
225220 unsigned short flags;
226221 unsigned short addr;
include/linux/i2c/pcf857x.h+1−2
@@ -12,8 +12,7 @@ · 11 unmodified lines
1212 * @context: optional parameter passed to setup() and teardown()
1313 *
1414 * 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
1716 * platform_data (pointer to one of these structures) with at least
1817 * the gpio_base value initialized.
1918 *
include/linux/init_task.h+1−22
@@ -1,7 +1,6 @@
11 #ifndef _LINUX__INIT_TASK_H
22 #define _LINUX__INIT_TASK_H
33
4−#include <linux/fdtable.h>
54 #include <linux/rcupdate.h>
65 #include <linux/irqflags.h>
76 #include <linux/utsname.h>
@@ -12,27 +11,7 @@ · 4 unmodified lines
1211 #include <linux/securebits.h>
1312 #include <net/net_namespace.h>
1413
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;
3615
3716 #define INIT_KIOCTX(name, which_mm) \
3817 { \
include/linux/libata.h+2−4
@@ -341,7 +341,7 @@ enum { · 340 unmodified lines
341341 ATA_EH_PMP_TRIES = 5,
342342 ATA_EH_PMP_LINK_TRIES = 3,
343343
344− SATA_PMP_SCR_TIMEOUT = 250,
344+ SATA_PMP_RW_TIMEOUT = 3000, /* PMP read/write timeout */
345345
346346 /* Horkage types. May be set by libata or controller on drives
347347 (some horkage may be drive/controller pair dependant */
@@ -351,7 +351,7 @@ enum { · 3 unmodified lines
351351 ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */
352352 ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */
353353 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 */
355355 ATA_HORKAGE_HPA_SIZE = (1 << 6), /* native size off by one */
356356 ATA_HORKAGE_IPM = (1 << 7), /* Link PM problems */
357357 ATA_HORKAGE_IVB = (1 << 8), /* cbl det validity bit bugs */
@@ -821,8 +821,6 @@ struct ata_timing { · 463 unmodified lines
821821 unsigned short udma; /* t2CYCTYP/2 */
822822 };
823823
824−#define FIT(v, vmin, vmax) max_t(short, min_t(short, v, vmax), vmin)
825−
826824 /*
827825 * Core layer - drivers/ata/libata-core.c
828826 */
include/linux/mman.h+2−2
@@ -17,14 +17,14 @@ · 16 unmodified lines
1717
1818 extern int sysctl_overcommit_memory;
1919 extern int sysctl_overcommit_ratio;
20−extern atomic_t vm_committed_space;
20+extern atomic_long_t vm_committed_space;
2121
2222 #ifdef CONFIG_SMP
2323 extern void vm_acct_memory(long pages);
2424 #else
2525 static inline void vm_acct_memory(long pages)
2626 {
27− atomic_add(pages, &vm_committed_space);
27+ atomic_long_add(pages, &vm_committed_space);
2828 }
2929 #endif
3030
include/linux/mmzone.h+1−1
@@ -703,7 +703,7 @@ extern struct pglist_data *next_online_pgdat(struct pglist_data *pgdat); · 702 unmodified lines
703703 extern struct zone *next_zone(struct zone *zone);
704704
705705 /**
706− * for_each_pgdat - helper macro to iterate over all nodes
706+ * for_each_online_pgdat - helper macro to iterate over all online nodes
707707 * @pgdat - pointer to a pg_data_t variable
708708 */
709709 #define for_each_online_pgdat(pgdat) \
include/linux/mod_devicetable.h+2−1
@@ -375,7 +375,8 @@ struct virtio_device_id { · 374 unmodified lines
375375
376376 struct i2c_device_id {
377377 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))));
379380 };
380381
381382
include/linux/netdevice.h+3−0
@@ -745,6 +745,9 @@ struct net_device · 744 unmodified lines
745745 /* rtnetlink link ops */
746746 const struct rtnl_link_ops *rtnl_link_ops;
747747
748+ /* VLAN feature mask */
749+ unsigned long vlan_features;
750+
748751 /* for setting kernel sock attribute on TCP connection setup */
749752 #define GSO_MAX_SIZE 65536
750753 unsigned int gso_max_size;
include/linux/netfilter.h+1−1
@@ -3,7 +3,6 @@ · 2 unmodified lines
33
44 #ifdef __KERNEL__
55 #include <linux/init.h>
6−#include <linux/types.h>
76 #include <linux/skbuff.h>
87 #include <linux/net.h>
98 #include <linux/netdevice.h>
@@ -14,6 +13,7 @@ · 4 unmodified lines
1413 #include <linux/list.h>
1514 #include <net/net_namespace.h>
1615 #endif
16+#include <linux/types.h>
1717 #include <linux/compiler.h>
1818
1919 /* Responses from hook functions. */
include/linux/netfilter_arp/arp_tables.h+1−1
@@ -11,11 +11,11 @@ · 10 unmodified lines
1111
1212 #ifdef __KERNEL__
1313 #include <linux/if.h>
14−#include <linux/types.h>
1514 #include <linux/in.h>
1615 #include <linux/if_arp.h>
1716 #include <linux/skbuff.h>
1817 #endif
18+#include <linux/types.h>
1919 #include <linux/compiler.h>
2020 #include <linux/netfilter_arp.h>
2121
include/linux/netfilter_ipv4/ip_tables.h+1−1
@@ -17,11 +17,11 @@ · 16 unmodified lines
1717
1818 #ifdef __KERNEL__
1919 #include <linux/if.h>
20−#include <linux/types.h>
2120 #include <linux/in.h>
2221 #include <linux/ip.h>
2322 #include <linux/skbuff.h>
2423 #endif
24+#include <linux/types.h>
2525 #include <linux/compiler.h>
2626 #include <linux/netfilter_ipv4.h>
2727
include/linux/netfilter_ipv6/ip6_tables.h+1−1
@@ -17,11 +17,11 @@ · 16 unmodified lines
1717
1818 #ifdef __KERNEL__
1919 #include <linux/if.h>
20−#include <linux/types.h>
2120 #include <linux/in6.h>
2221 #include <linux/ipv6.h>
2322 #include <linux/skbuff.h>
2423 #endif
24+#include <linux/types.h>
2525 #include <linux/compiler.h>
2626 #include <linux/netfilter_ipv6.h>
2727
include/linux/pci_ids.h+4−0
@@ -1761,6 +1761,7 @@ · 1760 unmodified lines
17611761
17621762 #define PCI_VENDOR_ID_INTASHIELD 0x135a
17631763 #define PCI_DEVICE_ID_INTASHIELD_IS200 0x0d80
1764+#define PCI_DEVICE_ID_INTASHIELD_IS400 0x0dc0
17641765
17651766 #define PCI_VENDOR_ID_QUATECH 0x135C
17661767 #define PCI_DEVICE_ID_QUATECH_QSC100 0x0010
@@ -2383,6 +2384,9 @@ · 616 unmodified lines
23832384 #define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30
23842385 #define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60
23852386 #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
23862390 #define PCI_DEVICE_ID_INTEL_IOAT_SCNB 0x65ff
23872391 #define PCI_DEVICE_ID_INTEL_TOLAPAI_0 0x5031
23882392 #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
262262 void bitmap_flush(mddev_t *mddev);
263263 void bitmap_destroy(mddev_t *mddev);
264264
265−char *file_path(struct file *file, char *buf, int count);
266265 void bitmap_print_sb(struct bitmap *bitmap);
267266 void bitmap_update_sb(struct bitmap *bitmap);
268267
include/linux/raid/md.h+2−0
@@ -72,6 +72,8 @@ · 71 unmodified lines
7272 */
7373 #define MD_PATCHLEVEL_VERSION 3
7474
75+extern int mdp_major;
76+
7577 extern int register_md_personality (struct mdk_personality *p);
7678 extern int unregister_md_personality (struct mdk_personality *p);
7779 extern 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
180180 int sync_speed_min;
181181 int sync_speed_max;
182182
183+ /* resync even though the same disks are shared among md-devices */
184+ int parallel_resync;
185+
183186 int ok_start_degraded;
184187 /* recovery/resync flags
185188 * NEEDED: we might need to start a resync/recover
186189 * RUNNING: a thread is running, or about to be started
187190 * 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
190192 * DONE: thread is done and is waiting to be reaped
191193 * REQUEST: user-space has requested a sync (used with SYNC)
192194 * CHECK: user-space request for for check-only, no repair
@@ -196,7 +198,6 @@ struct mddev_s · 3 unmodified lines
196198 */
197199 #define MD_RECOVERY_RUNNING 0
198200 #define MD_RECOVERY_SYNC 1
199−#define MD_RECOVERY_ERR 2
200201 #define MD_RECOVERY_INTR 3
201202 #define MD_RECOVERY_DONE 4
202203 #define MD_RECOVERY_NEEDED 5
include/linux/sched.h+2−0
@@ -1847,7 +1847,9 @@ extern void exit_thread(void); · 1846 unmodified lines
18471847 extern void exit_files(struct task_struct *);
18481848 extern void __cleanup_signal(struct signal_struct *);
18491849 extern void __cleanup_sighand(struct sighand_struct *);
1850+
18501851 extern void exit_itimers(struct signal_struct *);
1852+extern void flush_itimer_signals(void);
18511853
18521854 extern NORET_TYPE void do_group_exit(int);
18531855
include/linux/sm501.h+2−2
@@ -71,8 +71,8 @@ extern unsigned long sm501_gpio_get(struct device *dev, · 70 unmodified lines
7171 #define SM501FB_FLAG_DISABLE_AT_EXIT (1<<1)
7272 #define SM501FB_FLAG_USE_HWCURSOR (1<<2)
7373 #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)
7676
7777 struct sm501_platdata_fbsub {
7878 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
7171 * completes.
7272 */
7373 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;
7576 struct xdr_buf arg;
7677 struct list_head dto_q;
7778 enum ib_wr_opcode wr_op;
@@ -85,7 +86,6 @@ struct svc_rdma_op_ctxt { · 7 unmodified lines
8586 struct page *pages[RPCSVC_MAXPAGES];
8687 };
8788
88−#define RDMACTXT_F_READ_DONE 1
8989 #define RDMACTXT_F_LAST_CTXT 2
9090
9191 struct svcxprt_rdma {
@@ -104,7 +104,8 @@ struct svcxprt_rdma { · 12 unmodified lines
104104
105105 struct ib_pd *sc_pd;
106106
107− struct svc_rdma_op_ctxt *sc_ctxt_head;
107+ atomic_t sc_ctxt_used;
108+ struct list_head sc_ctxt_free;
108109 int sc_ctxt_cnt;
109110 int sc_ctxt_bump;
110111 int sc_ctxt_max;
@@ -123,6 +124,7 @@ struct svcxprt_rdma { · 12 unmodified lines
123124 struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */
124125 struct list_head sc_read_complete_q;
125126 spinlock_t sc_read_complete_lock;
127+ struct work_struct sc_work;
126128 };
127129 /* sc_flags */
128130 #define RDMAXPRT_RQ_PENDING 1
@@ -164,8 +166,8 @@ extern int svc_rdma_sendto(struct svc_rqst *); · 35 unmodified lines
164166
165167 /* svc_rdma_transport.c */
166168 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);
169171 struct page *svc_rdma_get_page(void);
170172 extern int svc_rdma_post_recv(struct svcxprt_rdma *);
171173 extern 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
355355 u32 lost_retrans_low; /* Sent seq after any rxmit (lowest) */
356356
357357 u16 advmss; /* Advertised MSS */
358− u16 prior_ssthresh; /* ssthresh saved at recovery start */
358+ u32 prior_ssthresh; /* ssthresh saved at recovery start */
359359 u32 lost_out; /* Lost packets */
360360 u32 sacked_out; /* SACK'd packets */
361361 u32 fackets_out; /* FACK'd packets */
include/linux/types.h+2−2
@@ -197,8 +197,6 @@ typedef u64 resource_size_t; · 196 unmodified lines
197197 typedef u32 resource_size_t;
198198 #endif
199199
200−#endif /* __KERNEL__ */
201−
202200 struct ustat {
203201 __kernel_daddr_t f_tfree;
204202 __kernel_ino_t f_tinode;
@@ -206,4 +204,6 @@ struct ustat { · 1 unmodified line
206204 char f_fpack[6];
207205 };
208206
207+#endif /* __KERNEL__ */
208+
209209 #endif /* _LINUX_TYPES_H */
include/linux/usb/cdc.h+9−0
@@ -130,6 +130,15 @@ struct usb_cdc_ether_desc { · 129 unmodified lines
130130 __u8 bNumberPowerFilters;
131131 } __attribute__ ((packed));
132132
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+
133142 /* "MDLM Functional Descriptor" from CDC WMC spec 6.7.2.3 */
134143 struct usb_cdc_mdlm_desc {
135144 __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