Merge branch 'linus' into x86/xen
Conflicts: arch/x86/kernel/paravirt.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
commit
e4f807c2b4
421 changed files with 4500 additions and 3221 deletions
|
|
@ -358,6 +358,7 @@ struct device {
|
|||
|
||||
struct kobject kobj;
|
||||
char bus_id[BUS_ID_SIZE]; /* position on parent bus */
|
||||
const char *init_name; /* initial name of the device */
|
||||
struct device_type *type;
|
||||
unsigned uevent_suppress:1;
|
||||
|
||||
|
|
@ -406,7 +407,7 @@ struct device {
|
|||
/* Get the wakeup routines, which depend on struct device */
|
||||
#include <linux/pm_wakeup.h>
|
||||
|
||||
static inline const char *dev_name(struct device *dev)
|
||||
static inline const char *dev_name(const struct device *dev)
|
||||
{
|
||||
/* will be changed into kobject_name(&dev->kobj) in the near future */
|
||||
return dev->bus_id;
|
||||
|
|
@ -518,7 +519,7 @@ extern void device_shutdown(void);
|
|||
extern void sysdev_shutdown(void);
|
||||
|
||||
/* debugging and troubleshooting/diagnostic helpers. */
|
||||
extern const char *dev_driver_string(struct device *dev);
|
||||
extern const char *dev_driver_string(const struct device *dev);
|
||||
#define dev_printk(level, dev, format, arg...) \
|
||||
printk(level "%s %s: " format , dev_driver_string(dev) , \
|
||||
dev_name(dev) , ## arg)
|
||||
|
|
|
|||
|
|
@ -34,6 +34,27 @@ enum fid_type {
|
|||
*/
|
||||
FILEID_INO32_GEN_PARENT = 2,
|
||||
|
||||
/*
|
||||
* 64 bit object ID, 64 bit root object ID,
|
||||
* 32 bit generation number.
|
||||
*/
|
||||
FILEID_BTRFS_WITHOUT_PARENT = 0x4d,
|
||||
|
||||
/*
|
||||
* 64 bit object ID, 64 bit root object ID,
|
||||
* 32 bit generation number,
|
||||
* 64 bit parent object ID, 32 bit parent generation.
|
||||
*/
|
||||
FILEID_BTRFS_WITH_PARENT = 0x4e,
|
||||
|
||||
/*
|
||||
* 64 bit object ID, 64 bit root object ID,
|
||||
* 32 bit generation number,
|
||||
* 64 bit parent object ID, 32 bit parent generation,
|
||||
* 64 bit parent root object ID.
|
||||
*/
|
||||
FILEID_BTRFS_WITH_PARENT_ROOT = 0x4f,
|
||||
|
||||
/*
|
||||
* 32 bit block number, 16 bit partition reference,
|
||||
* 16 bit unused, 32 bit generation number.
|
||||
|
|
|
|||
|
|
@ -976,6 +976,9 @@ static inline void __fb_pad_aligned_buffer(u8 *dst, u32 d_pitch,
|
|||
|
||||
/* drivers/video/fb_defio.c */
|
||||
extern void fb_deferred_io_init(struct fb_info *info);
|
||||
extern void fb_deferred_io_open(struct fb_info *info,
|
||||
struct inode *inode,
|
||||
struct file *file);
|
||||
extern void fb_deferred_io_cleanup(struct fb_info *info);
|
||||
extern int fb_deferred_io_fsync(struct file *file, struct dentry *dentry,
|
||||
int datasync);
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
#ifndef FS_UART_PD_H
|
||||
#define FS_UART_PD_H
|
||||
|
||||
#include <linux/version.h>
|
||||
#include <asm/types.h>
|
||||
|
||||
enum fs_uart_id {
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@
|
|||
#define TUNGETFEATURES _IOR('T', 207, unsigned int)
|
||||
#define TUNSETOFFLOAD _IOW('T', 208, unsigned int)
|
||||
#define TUNSETTXFILTER _IOW('T', 209, unsigned int)
|
||||
#define TUNGETIFF _IOR('T', 210, unsigned int)
|
||||
|
||||
/* TUNSETIFF ifr flags */
|
||||
#define IFF_TUN 0x0001
|
||||
|
|
|
|||
|
|
@ -163,6 +163,7 @@ enum {
|
|||
ATA_DEV_NONE = 9, /* no device */
|
||||
|
||||
/* struct ata_link flags */
|
||||
ATA_LFLAG_NO_HRST = (1 << 1), /* avoid hardreset */
|
||||
ATA_LFLAG_NO_SRST = (1 << 2), /* avoid softreset */
|
||||
ATA_LFLAG_ASSUME_ATA = (1 << 3), /* assume ATA class */
|
||||
ATA_LFLAG_ASSUME_SEMB = (1 << 4), /* assume SEMB class */
|
||||
|
|
@ -646,6 +647,7 @@ struct ata_link {
|
|||
|
||||
unsigned int flags; /* ATA_LFLAG_xxx */
|
||||
|
||||
u32 saved_scontrol; /* SControl on probe */
|
||||
unsigned int hw_sata_spd_limit;
|
||||
unsigned int sata_spd_limit;
|
||||
unsigned int sata_spd; /* current SATA PHY speed */
|
||||
|
|
@ -1427,6 +1429,28 @@ static inline unsigned long ata_deadline(unsigned long from_jiffies,
|
|||
return from_jiffies + msecs_to_jiffies(timeout_msecs);
|
||||
}
|
||||
|
||||
/* Don't open code these in drivers as there are traps. Firstly the range may
|
||||
change in future hardware and specs, secondly 0xFF means 'no DMA' but is
|
||||
> UDMA_0. Dyma ddreigiau */
|
||||
|
||||
static inline int ata_using_mwdma(struct ata_device *adev)
|
||||
{
|
||||
if (adev->dma_mode >= XFER_MW_DMA_0 && adev->dma_mode <= XFER_MW_DMA_4)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int ata_using_udma(struct ata_device *adev)
|
||||
{
|
||||
if (adev->dma_mode >= XFER_UDMA_0 && adev->dma_mode <= XFER_UDMA_7)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int ata_dma_enabled(struct ata_device *adev)
|
||||
{
|
||||
return (adev->dma_mode == 0xFF ? 0 : 1);
|
||||
}
|
||||
|
||||
/**************************************************************************
|
||||
* PMP - drivers/ata/libata-pmp.c
|
||||
|
|
|
|||
|
|
@ -57,6 +57,15 @@ static inline acpi_status pcie_osc_support_set(u32 flags)
|
|||
{
|
||||
return __pci_osc_support_set(flags, PCI_EXPRESS_ROOT_HID_STRING);
|
||||
}
|
||||
static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
|
||||
{
|
||||
/* Find root host bridge */
|
||||
while (pdev->bus->self)
|
||||
pdev = pdev->bus->self;
|
||||
|
||||
return acpi_get_pci_rootbridge_handle(pci_domain_nr(pdev->bus),
|
||||
pdev->bus->number);
|
||||
}
|
||||
#else
|
||||
#if !defined(AE_ERROR)
|
||||
typedef u32 acpi_status;
|
||||
|
|
@ -66,6 +75,8 @@ static inline acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
|
|||
{return AE_ERROR;}
|
||||
static inline acpi_status pci_osc_support_set(u32 flags) {return AE_ERROR;}
|
||||
static inline acpi_status pcie_osc_support_set(u32 flags) {return AE_ERROR;}
|
||||
static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
|
||||
{ return NULL; }
|
||||
#endif
|
||||
|
||||
#endif /* _PCI_ACPI_H_ */
|
||||
|
|
|
|||
|
|
@ -2428,6 +2428,9 @@
|
|||
#define PCI_DEVICE_ID_INTEL_ICH10_3 0x3a1a
|
||||
#define PCI_DEVICE_ID_INTEL_ICH10_4 0x3a30
|
||||
#define PCI_DEVICE_ID_INTEL_ICH10_5 0x3a60
|
||||
#define PCI_DEVICE_ID_INTEL_PCH_0 0x3b10
|
||||
#define PCI_DEVICE_ID_INTEL_PCH_1 0x3b11
|
||||
#define PCI_DEVICE_ID_INTEL_PCH_2 0x3b30
|
||||
#define PCI_DEVICE_ID_INTEL_IOAT_SNB 0x402f
|
||||
#define PCI_DEVICE_ID_INTEL_5100_16 0x65f0
|
||||
#define PCI_DEVICE_ID_INTEL_5100_21 0x65f5
|
||||
|
|
|
|||
|
|
@ -161,4 +161,13 @@ pid_t pid_vnr(struct pid *pid);
|
|||
} \
|
||||
} while (0)
|
||||
|
||||
#define do_each_pid_thread(pid, type, task) \
|
||||
do_each_pid_task(pid, type, task) { \
|
||||
struct task_struct *tg___ = task; \
|
||||
do {
|
||||
|
||||
#define while_each_pid_thread(pid, type, task) \
|
||||
} while_each_thread(tg___, task); \
|
||||
task = tg___; \
|
||||
} while_each_pid_task(pid, type, task)
|
||||
#endif /* _LINUX_PID_H */
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ int try_to_unmap(struct page *, int ignore_refs);
|
|||
* Called from mm/filemap_xip.c to unmap empty zero page
|
||||
*/
|
||||
pte_t *page_check_address(struct page *, struct mm_struct *,
|
||||
unsigned long, spinlock_t **);
|
||||
unsigned long, spinlock_t **, int);
|
||||
|
||||
/*
|
||||
* Used by swapoff to help locate where page is expected in vma.
|
||||
|
|
|
|||
|
|
@ -1452,6 +1452,10 @@ extern int skb_copy_datagram_iovec(const struct sk_buff *from,
|
|||
extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
|
||||
int hlen,
|
||||
struct iovec *iov);
|
||||
extern int skb_copy_datagram_from_iovec(struct sk_buff *skb,
|
||||
int offset,
|
||||
struct iovec *from,
|
||||
int len);
|
||||
extern void skb_free_datagram(struct sock *sk, struct sk_buff *skb);
|
||||
extern int skb_kill_datagram(struct sock *sk, struct sk_buff *skb,
|
||||
unsigned int flags);
|
||||
|
|
|
|||
|
|
@ -74,10 +74,13 @@ extern struct tick_device *tick_get_device(int cpu);
|
|||
extern int tick_init_highres(void);
|
||||
extern int tick_program_event(ktime_t expires, int force);
|
||||
extern void tick_setup_sched_timer(void);
|
||||
# endif
|
||||
|
||||
# if defined CONFIG_NO_HZ || defined CONFIG_HIGH_RES_TIMERS
|
||||
extern void tick_cancel_sched_timer(int cpu);
|
||||
# else
|
||||
static inline void tick_cancel_sched_timer(int cpu) { }
|
||||
# endif /* HIGHRES */
|
||||
# endif
|
||||
|
||||
# ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
|
||||
extern struct tick_device *tick_get_broadcast_device(void);
|
||||
|
|
|
|||
|
|
@ -110,6 +110,8 @@ enum usb_interface_condition {
|
|||
* @sysfs_files_created: sysfs attributes exist
|
||||
* @needs_remote_wakeup: flag set when the driver requires remote-wakeup
|
||||
* capability during autosuspend.
|
||||
* @needs_altsetting0: flag set when a set-interface request for altsetting 0
|
||||
* has been deferred.
|
||||
* @needs_binding: flag set when the driver should be re-probed or unbound
|
||||
* following a reset or suspend operation it doesn't support.
|
||||
* @dev: driver model's view of this device
|
||||
|
|
@ -162,6 +164,7 @@ struct usb_interface {
|
|||
unsigned is_active:1; /* the interface is not suspended */
|
||||
unsigned sysfs_files_created:1; /* the sysfs attributes exist */
|
||||
unsigned needs_remote_wakeup:1; /* driver requires remote wakeup */
|
||||
unsigned needs_altsetting0:1; /* switch to altsetting 0 is pending */
|
||||
unsigned needs_binding:1; /* needs delayed unbind/rebind */
|
||||
|
||||
struct device dev; /* interface specific device info */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue