diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-29 09:51:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-29 09:51:25 -0700 |
| commit | 83169a1aaf82854b0956149d9dd719d300f0115d (patch) | |
| tree | ec437557c7e18ed924004f43e2c3f848207aca6f /include/linux | |
| parent | 1f78099a061ff3c652f9fbe5d03f6db74f72b146 (diff) | |
| parent | d8f87a6c97470620937e43eb27e0592373e343c5 (diff) | |
Merge bk://kernel.bkbits.net/davem/sparc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 2 | ||||
| -rw-r--r-- | include/linux/pci.h | 6 | ||||
| -rw-r--r-- | include/linux/proc_fs.h | 11 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 6 |
4 files changed, 22 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index e445c167c919..ff568eaf4f3a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -147,8 +147,6 @@ enum { #ifdef __KERNEL__ -extern const char *if_port_text[]; - #include <linux/cache.h> #include <linux/skbuff.h> diff --git a/include/linux/pci.h b/include/linux/pci.h index fd6f80c5142d..c73088aa5dcf 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -390,6 +390,11 @@ struct pci_dev { or supports 64-bit transfers. */ struct list_head pools; /* pci_pools tied to this device */ + u64 consistent_dma_mask;/* Like dma_mask, but for + pci_alloc_consistent mappings as + not all hardware supports + 64 bit addresses for consistent + allocations such descriptors. */ u32 current_state; /* Current operating state. In ACPI-speak, this is D0-D3, D0 being fully functional, and D3 being off. */ @@ -623,6 +628,7 @@ int pci_set_mwi(struct pci_dev *dev); void pci_clear_mwi(struct pci_dev *dev); int pci_set_dma_mask(struct pci_dev *dev, u64 mask); int pci_dac_set_dma_mask(struct pci_dev *dev, u64 mask); +int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask); int pci_assign_resource(struct pci_dev *dev, int i); /* Power management related routines */ diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 4607df82fd93..d099b44dd2f0 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -187,6 +187,9 @@ static inline struct proc_dir_entry *proc_net_create(const char *name, mode_t mo get_info_t *get_info) {return NULL;} static inline void proc_net_remove(const char *name) {} +static inline struct dentry *proc_pid_unhash(struct task_struct *p) { return NULL; } +static inline void proc_pid_flush(struct dentry *proc_dentry) { } + static inline struct proc_dir_entry *create_proc_entry(const char *name, mode_t mode, struct proc_dir_entry *parent) { return NULL; } @@ -212,6 +215,14 @@ static inline void proc_tty_unregister_driver(struct tty_driver *driver) {}; extern struct proc_dir_entry proc_root; +static inline void kclist_add(struct kcore_list *new, void *addr, size_t size) +{ +} +static inline struct kcore_list * kclist_del(void *addr) +{ + return NULL; +} + #endif /* CONFIG_PROC_FS */ struct proc_inode { diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index d35eacac5acf..bbd0b376d757 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -366,7 +366,11 @@ enum { NET_IPV6_NEIGH=17, NET_IPV6_ROUTE=18, NET_IPV6_ICMP=19, - NET_IPV6_BINDV6ONLY=20 + NET_IPV6_BINDV6ONLY=20, + NET_IPV6_IP6FRAG_HIGH_THRESH=21, + NET_IPV6_IP6FRAG_LOW_THRESH=22, + NET_IPV6_IP6FRAG_TIME=23, + NET_IPV6_IP6FRAG_SECRET_INTERVAL=24 }; enum { |