aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/topology.h10
-rw-r--r--include/linux/ide.h13
-rw-r--r--include/linux/sunrpc/svc.h13
3 files changed, 17 insertions, 19 deletions
diff --git a/include/asm-generic/topology.h b/include/asm-generic/topology.h
index 5d9d70cd17fc..342a2a0105c4 100644
--- a/include/asm-generic/topology.h
+++ b/include/asm-generic/topology.h
@@ -30,19 +30,19 @@
30/* Other architectures wishing to use this simple topology API should fill 30/* Other architectures wishing to use this simple topology API should fill
31 in the below functions as appropriate in their own <asm/topology.h> file. */ 31 in the below functions as appropriate in their own <asm/topology.h> file. */
32#ifndef cpu_to_node 32#ifndef cpu_to_node
33#define cpu_to_node(cpu) (0) 33#define cpu_to_node(cpu) ((void)(cpu),0)
34#endif 34#endif
35#ifndef parent_node 35#ifndef parent_node
36#define parent_node(node) (0) 36#define parent_node(node) ((void)(node),0)
37#endif 37#endif
38#ifndef node_to_cpumask 38#ifndef node_to_cpumask
39#define node_to_cpumask(node) (cpu_online_map) 39#define node_to_cpumask(node) ((void)node, cpu_online_map)
40#endif 40#endif
41#ifndef node_to_first_cpu 41#ifndef node_to_first_cpu
42#define node_to_first_cpu(node) (0) 42#define node_to_first_cpu(node) ((void)(node),0)
43#endif 43#endif
44#ifndef pcibus_to_node 44#ifndef pcibus_to_node
45#define pcibus_to_node(node) (-1) 45#define pcibus_to_node(bus) ((void)(bus), -1)
46#endif 46#endif
47 47
48#ifndef pcibus_to_cpumask 48#ifndef pcibus_to_cpumask
diff --git a/include/linux/ide.h b/include/linux/ide.h
index acec99da832d..a3b69c10d667 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -906,6 +906,8 @@ enum {
906 IDE_TFLAG_IN_DEVICE, 906 IDE_TFLAG_IN_DEVICE,
907 /* force 16-bit I/O operations */ 907 /* force 16-bit I/O operations */
908 IDE_TFLAG_IO_16BIT = (1 << 30), 908 IDE_TFLAG_IO_16BIT = (1 << 30),
909 /* ide_task_t was allocated using kmalloc() */
910 IDE_TFLAG_DYN = (1 << 31),
909}; 911};
910 912
911struct ide_taskfile { 913struct ide_taskfile {
@@ -998,8 +1000,7 @@ extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *o
998void ide_pci_setup_ports(struct pci_dev *, const struct ide_port_info *, int, u8 *); 1000void ide_pci_setup_ports(struct pci_dev *, const struct ide_port_info *, int, u8 *);
999void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *); 1001void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *);
1000 1002
1001/* FIXME: palm_bk3710 uses BLK_DEV_IDEDMA_PCI without BLK_DEV_IDEPCI! */ 1003#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
1002#if defined(CONFIG_BLK_DEV_IDEPCI) && defined(CONFIG_BLK_DEV_IDEDMA_PCI)
1003void ide_hwif_setup_dma(ide_hwif_t *, const struct ide_port_info *); 1004void ide_hwif_setup_dma(ide_hwif_t *, const struct ide_port_info *);
1004#else 1005#else
1005static inline void ide_hwif_setup_dma(ide_hwif_t *hwif, 1006static inline void ide_hwif_setup_dma(ide_hwif_t *hwif,
@@ -1146,7 +1147,7 @@ ide_startstop_t ide_dma_intr(ide_drive_t *);
1146int ide_build_sglist(ide_drive_t *, struct request *); 1147int ide_build_sglist(ide_drive_t *, struct request *);
1147void ide_destroy_dmatable(ide_drive_t *); 1148void ide_destroy_dmatable(ide_drive_t *);
1148 1149
1149#ifdef CONFIG_BLK_DEV_IDEDMA_PCI 1150#ifdef CONFIG_BLK_DEV_IDEDMA_SFF
1150extern int ide_build_dmatable(ide_drive_t *, struct request *); 1151extern int ide_build_dmatable(ide_drive_t *, struct request *);
1151extern int ide_release_dma(ide_hwif_t *); 1152extern int ide_release_dma(ide_hwif_t *);
1152extern void ide_setup_dma(ide_hwif_t *, unsigned long); 1153extern void ide_setup_dma(ide_hwif_t *, unsigned long);
@@ -1157,7 +1158,7 @@ extern void ide_dma_start(ide_drive_t *);
1157extern int __ide_dma_end(ide_drive_t *); 1158extern int __ide_dma_end(ide_drive_t *);
1158extern void ide_dma_lost_irq(ide_drive_t *); 1159extern void ide_dma_lost_irq(ide_drive_t *);
1159extern void ide_dma_timeout(ide_drive_t *); 1160extern void ide_dma_timeout(ide_drive_t *);
1160#endif /* CONFIG_BLK_DEV_IDEDMA_PCI */ 1161#endif /* CONFIG_BLK_DEV_IDEDMA_SFF */
1161 1162
1162#else 1163#else
1163static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; } 1164static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; }
@@ -1171,7 +1172,7 @@ static inline int ide_set_dma(ide_drive_t *drive) { return 1; }
1171static inline void ide_check_dma_crc(ide_drive_t *drive) { ; } 1172static inline void ide_check_dma_crc(ide_drive_t *drive) { ; }
1172#endif /* CONFIG_BLK_DEV_IDEDMA */ 1173#endif /* CONFIG_BLK_DEV_IDEDMA */
1173 1174
1174#ifndef CONFIG_BLK_DEV_IDEDMA_PCI 1175#ifndef CONFIG_BLK_DEV_IDEDMA_SFF
1175static inline void ide_release_dma(ide_hwif_t *drive) {;} 1176static inline void ide_release_dma(ide_hwif_t *drive) {;}
1176#endif 1177#endif
1177 1178
@@ -1294,7 +1295,7 @@ static inline void ide_dump_identify(u8 *id)
1294static inline int hwif_to_node(ide_hwif_t *hwif) 1295static inline int hwif_to_node(ide_hwif_t *hwif)
1295{ 1296{
1296 struct pci_dev *dev = to_pci_dev(hwif->dev); 1297 struct pci_dev *dev = to_pci_dev(hwif->dev);
1297 return dev ? pcibus_to_node(dev->bus) : -1; 1298 return hwif->dev ? pcibus_to_node(dev->bus) : -1;
1298} 1299}
1299 1300
1300static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive) 1301static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive)
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 64c771056187..64c97552964a 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -409,16 +409,13 @@ char * svc_print_addr(struct svc_rqst *, char *, size_t);
409 * for all cases without actually generating the checksum, so we just use a 409 * for all cases without actually generating the checksum, so we just use a
410 * static value. 410 * static value.
411 */ 411 */
412static inline void 412static inline void svc_reserve_auth(struct svc_rqst *rqstp, int space)
413svc_reserve_auth(struct svc_rqst *rqstp, int space)
414{ 413{
415 int added_space = 0; 414 int added_space = 0;
416 415
417 switch(rqstp->rq_authop->flavour) { 416 if (rqstp->rq_authop->flavour)
418 case RPC_AUTH_GSS: 417 added_space = RPC_MAX_AUTH_SIZE;
419 added_space = RPC_MAX_AUTH_SIZE; 418 svc_reserve(rqstp, space + added_space);
420 }
421 return svc_reserve(rqstp, space + added_space);
422} 419}
423 420
424#endif /* SUNRPC_SVC_H */ 421#endif /* SUNRPC_SVC_H */