diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 6 | ||||
| -rw-r--r-- | include/linux/gen_stats.h | 5 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 | ||||
| -rw-r--r-- | include/linux/sched.h | 13 | ||||
| -rw-r--r-- | include/linux/serial_core.h | 13 | ||||
| -rw-r--r-- | include/linux/usbdevice_fs.h | 25 |
6 files changed, 30 insertions, 33 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 97ff28cd67e8..0bd6704baa60 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -489,15 +489,15 @@ static inline int acpi_blacklisted(void) * 2: C2 okay, but not C3 etc. */ -extern unsigned int acpi_cstate_limit; +extern unsigned int max_cstate; static inline unsigned int acpi_get_cstate_limit(void) { - return acpi_cstate_limit; + return max_cstate; } static inline void acpi_set_cstate_limit(unsigned int new_limit) { - acpi_cstate_limit = new_limit; + max_cstate = new_limit; return; } #else diff --git a/include/linux/gen_stats.h b/include/linux/gen_stats.h index ab631c3571ce..13f4e74609ac 100644 --- a/include/linux/gen_stats.h +++ b/include/linux/gen_stats.h @@ -14,6 +14,7 @@ enum { #define TCA_STATS_MAX (__TCA_STATS_MAX - 1) /** + * struct gnet_stats_basic - byte/packet throughput statistics * @bytes: number of seen bytes * @packets: number of seen packets */ @@ -24,6 +25,7 @@ struct gnet_stats_basic }; /** + * struct gnet_stats_rate_est - rate estimator * @bps: current byte rate * @pps: current packet rate */ @@ -34,10 +36,12 @@ struct gnet_stats_rate_est }; /** + * struct gnet_stats_queue - queuing statistics * @qlen: queue length * @backlog: backlog size of queue * @drops: number of dropped packets * @requeues: number of requeues + * @overlimits: number of enqueues over the limit */ struct gnet_stats_queue { @@ -49,6 +53,7 @@ struct gnet_stats_queue }; /** + * struct gnet_estimator - rate estimator configuration * @interval: sampling period * @ewma_log: the log of measurement window weight */ diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 5cfcf8941445..f1946ad646e4 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1087,6 +1087,7 @@ #define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE 0x0065 #define PCI_DEVICE_ID_NVIDIA_NVENET_2 0x0066 #define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO 0x006a +#define PCI_DEVICE_ID_NVIDIA_NFORCE2S_SMBUS 0x0084 #define PCI_DEVICE_ID_NVIDIA_NFORCE2S_IDE 0x0085 #define PCI_DEVICE_ID_NVIDIA_NVENET_4 0x0086 #define PCI_DEVICE_ID_NVIDIA_NVENET_5 0x008c diff --git a/include/linux/sched.h b/include/linux/sched.h index 0c8262c6d6b8..440393fcd5c7 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -671,6 +671,19 @@ static inline pid_t process_group(struct task_struct *tsk) return tsk->signal->pgrp; } +/** + * pid_alive - check that a task structure is not stale + * @p: Task structure to be checked. + * + * Test if a process is not yet dead (at most zombie state) + * If pid_alive fails, then pointers within the task structure + * can be stale and must not be dereferenced. + */ +static inline int pid_alive(struct task_struct *p) +{ + return p->pids[PIDTYPE_PID].nr != 0; +} + extern void free_task(struct task_struct *tsk); extern void __put_task_struct(struct task_struct *tsk); #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0) diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 3fad76b0873c..9666c572f65b 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -91,12 +91,15 @@ /* MPC52xx type numbers */ #define PORT_MPC52xx 59 -/*IBM icom*/ -#define PORT_ICOM 60 +/* IBM icom */ +#define PORT_ICOM 60 /* Samsung S3C2440 SoC */ #define PORT_S3C2440 61 +/* Motorola i.MX SoC */ +#define PORT_IMX 62 + #ifdef __KERNEL__ #include <linux/config.h> @@ -241,11 +244,11 @@ struct uart_port { * within. */ struct uart_state { - unsigned int close_delay; - unsigned int closing_wait; + unsigned int close_delay; /* msec */ + unsigned int closing_wait; /* msec */ #define USF_CLOSING_WAIT_INF (0) -#define USF_CLOSING_WAIT_NONE (65535) +#define USF_CLOSING_WAIT_NONE (~0U) int count; int pm_state; diff --git a/include/linux/usbdevice_fs.h b/include/linux/usbdevice_fs.h index af49afaf7bb4..aed8193eb420 100644 --- a/include/linux/usbdevice_fs.h +++ b/include/linux/usbdevice_fs.h @@ -144,29 +144,4 @@ struct usbdevfs_hub_portinfo { #define USBDEVFS_DISCONNECT _IO('U', 22) #define USBDEVFS_CONNECT _IO('U', 23) -/* --------------------------------------------------------------------- */ - -#ifdef __KERNEL__ - -#include <linux/list.h> -#include <asm/semaphore.h> - - -struct dev_state { - struct list_head list; /* state list */ - struct usb_device *dev; - struct file *file; - spinlock_t lock; /* protects the async urb lists */ - struct list_head async_pending; - struct list_head async_completed; - wait_queue_head_t wait; /* wake up if a request completed */ - unsigned int discsignr; - struct task_struct *disctask; - void __user *disccontext; - unsigned long ifclaimed; -}; - -#endif /* __KERNEL__ */ - -/* --------------------------------------------------------------------- */ #endif /* _LINUX_USBDEVICE_FS_H */ |