mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
Merge branch 'linux-2.6'
This commit is contained in:
Paul Mackerras
commit
54f53f2b94
541 changed files with 9414 additions and 6152 deletions
|
|
@ -127,7 +127,6 @@ header-y += pkt_sched.h
|
|||
header-y += posix_types.h
|
||||
header-y += ppdev.h
|
||||
header-y += prctl.h
|
||||
header-y += ps2esdi.h
|
||||
header-y += qnxtypes.h
|
||||
header-y += quotaio_v1.h
|
||||
header-y += quotaio_v2.h
|
||||
|
|
|
|||
|
|
@ -49,11 +49,11 @@ struct fid {
|
|||
|
||||
/**
|
||||
* struct export_operations - for nfsd to communicate with file systems
|
||||
* @decode_fh: decode a file handle fragment and return a &struct dentry
|
||||
* @encode_fh: encode a file handle fragment from a dentry
|
||||
* @fh_to_dentry: find the implied object and get a dentry for it
|
||||
* @fh_to_parent: find the implied object's parent and get a dentry for it
|
||||
* @get_name: find the name for a given inode in a given directory
|
||||
* @get_parent: find the parent of a given directory
|
||||
* @get_dentry: find a dentry for the inode given a file handle sub-fragment
|
||||
*
|
||||
* See Documentation/filesystems/Exporting for details on how to use
|
||||
* this interface correctly.
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ static inline bool ipv4_is_local_multicast(__be32 addr)
|
|||
static inline bool ipv4_is_lbcast(__be32 addr)
|
||||
{
|
||||
/* limited broadcast */
|
||||
return addr == INADDR_BROADCAST;
|
||||
return addr == htonl(INADDR_BROADCAST);
|
||||
}
|
||||
|
||||
static inline bool ipv4_is_zeronet(__be32 addr)
|
||||
|
|
|
|||
|
|
@ -348,8 +348,7 @@ static inline void jbd_unlock_bh_journal_head(struct buffer_head *bh)
|
|||
struct jbd_revoke_table_s;
|
||||
|
||||
/**
|
||||
* struct handle_s - The handle_s type is the concrete type associated with
|
||||
* handle_t.
|
||||
* struct handle_s - this is the concrete type associated with handle_t.
|
||||
* @h_transaction: Which compound transaction is this update a part of?
|
||||
* @h_buffer_credits: Number of remaining buffers we are allowed to dirty.
|
||||
* @h_ref: Reference count on this handle
|
||||
|
|
@ -358,12 +357,7 @@ struct jbd_revoke_table_s;
|
|||
* @h_jdata: flag to force data journaling
|
||||
* @h_aborted: flag indicating fatal error on handle
|
||||
* @h_lockdep_map: lockdep info for debugging lock problems
|
||||
**/
|
||||
|
||||
/* Docbook can't yet cope with the bit fields, but will leave the documentation
|
||||
* in so it can be fixed later.
|
||||
*/
|
||||
|
||||
struct handle_s
|
||||
{
|
||||
/* Which compound transaction is this update a part of? */
|
||||
|
|
@ -558,8 +552,7 @@ struct transaction_s
|
|||
};
|
||||
|
||||
/**
|
||||
* struct journal_s - The journal_s type is the concrete type associated with
|
||||
* journal_t.
|
||||
* struct journal_s - this is the concrete type associated with journal_t.
|
||||
* @j_flags: General journaling state flags
|
||||
* @j_errno: Is there an outstanding uncleared error on the journal (from a
|
||||
* prior abort)?
|
||||
|
|
|
|||
|
|
@ -463,6 +463,7 @@ struct ata_queued_cmd {
|
|||
unsigned int sect_size;
|
||||
|
||||
unsigned int nbytes;
|
||||
unsigned int extrabytes;
|
||||
unsigned int curbytes;
|
||||
|
||||
struct scatterlist *cursg;
|
||||
|
|
@ -1336,6 +1337,11 @@ static inline struct ata_queued_cmd *ata_qc_from_tag(struct ata_port *ap,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static inline unsigned int ata_qc_raw_nbytes(struct ata_queued_cmd *qc)
|
||||
{
|
||||
return qc->nbytes - min(qc->extrabytes, qc->nbytes);
|
||||
}
|
||||
|
||||
static inline void ata_tf_init(struct ata_device *dev, struct ata_taskfile *tf)
|
||||
{
|
||||
memset(tf, 0, sizeof(*tf));
|
||||
|
|
@ -1354,7 +1360,7 @@ static inline void ata_qc_reinit(struct ata_queued_cmd *qc)
|
|||
qc->flags = 0;
|
||||
qc->cursg = NULL;
|
||||
qc->cursg_ofs = 0;
|
||||
qc->nbytes = qc->curbytes = 0;
|
||||
qc->nbytes = qc->extrabytes = qc->curbytes = 0;
|
||||
qc->n_elem = 0;
|
||||
qc->err_mask = 0;
|
||||
qc->sect_size = ATA_SECT_SIZE;
|
||||
|
|
|
|||
|
|
@ -239,7 +239,6 @@ struct memstick_request {
|
|||
unsigned char tpc;
|
||||
unsigned char data_dir:1,
|
||||
need_card_int:1,
|
||||
get_int_reg:1,
|
||||
long_data:1;
|
||||
unsigned char int_reg;
|
||||
int error;
|
||||
|
|
|
|||
|
|
@ -278,6 +278,7 @@ struct pci_bus {
|
|||
struct device dev;
|
||||
struct bin_attribute *legacy_io; /* legacy I/O for this bus */
|
||||
struct bin_attribute *legacy_mem; /* legacy mem */
|
||||
unsigned int is_added:1;
|
||||
};
|
||||
|
||||
#define pci_bus_b(n) list_entry(n, struct pci_bus, node)
|
||||
|
|
@ -512,7 +513,6 @@ int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap);
|
|||
int pci_find_ext_capability(struct pci_dev *dev, int cap);
|
||||
int pci_find_ht_capability(struct pci_dev *dev, int ht_cap);
|
||||
int pci_find_next_ht_capability(struct pci_dev *dev, int pos, int ht_cap);
|
||||
void pcie_wait_pending_transaction(struct pci_dev *dev);
|
||||
struct pci_bus *pci_find_next_bus(const struct pci_bus *from);
|
||||
|
||||
struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device,
|
||||
|
|
@ -883,9 +883,6 @@ static inline int pci_find_ext_capability(struct pci_dev *dev, int cap)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static inline void pcie_wait_pending_transaction(struct pci_dev *dev)
|
||||
{ }
|
||||
|
||||
/* Power management related routines */
|
||||
static inline int pci_save_state(struct pci_dev *dev)
|
||||
{
|
||||
|
|
@ -1044,6 +1041,8 @@ void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen);
|
|||
void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr);
|
||||
void __iomem * const *pcim_iomap_table(struct pci_dev *pdev);
|
||||
int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name);
|
||||
int pcim_iomap_regions_request_all(struct pci_dev *pdev, u16 mask,
|
||||
const char *name);
|
||||
void pcim_iounmap_regions(struct pci_dev *pdev, u16 mask);
|
||||
|
||||
extern int pci_pci_problems;
|
||||
|
|
|
|||
|
|
@ -201,8 +201,8 @@ enum
|
|||
|
||||
struct tc_u32_key
|
||||
{
|
||||
__u32 mask;
|
||||
__u32 val;
|
||||
__be32 mask;
|
||||
__be32 val;
|
||||
int off;
|
||||
int offmask;
|
||||
};
|
||||
|
|
@ -213,12 +213,12 @@ struct tc_u32_sel
|
|||
unsigned char offshift;
|
||||
unsigned char nkeys;
|
||||
|
||||
__u16 offmask;
|
||||
__be16 offmask;
|
||||
__u16 off;
|
||||
short offoff;
|
||||
|
||||
short hoff;
|
||||
__u32 hmask;
|
||||
__be32 hmask;
|
||||
struct tc_u32_key keys[0];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#include <linux/mod_devicetable.h>
|
||||
|
||||
#define PNP_MAX_PORT 40
|
||||
#define PNP_MAX_MEM 12
|
||||
#define PNP_MAX_MEM 24
|
||||
#define PNP_MAX_IRQ 2
|
||||
#define PNP_MAX_DMA 2
|
||||
#define PNP_NAME_LEN 50
|
||||
|
|
|
|||
|
|
@ -1,98 +0,0 @@
|
|||
#ifndef _PS2ESDI_H_
|
||||
#define _PS2ESDI_H_
|
||||
|
||||
#define NRML_ESDI_ID 0xddff
|
||||
#define INTG_ESDI_ID 0xdf9f
|
||||
|
||||
#define PRIMARY_IO_BASE 0x3510
|
||||
#define ALT_IO_BASE 0x3518
|
||||
|
||||
#define ESDI_CMD_INT (io_base+0)
|
||||
#define ESDI_STT_INT (io_base+0)
|
||||
#define ESDI_CONTROL (io_base+2)
|
||||
#define ESDI_STATUS (io_base+2)
|
||||
#define ESDI_ATTN (io_base+3)
|
||||
#define ESDI_INTRPT (io_base+3)
|
||||
|
||||
#define STATUS_ENABLED 0x01
|
||||
#define STATUS_ALTERNATE 0x02
|
||||
#define STATUS_BUSY 0x10
|
||||
#define STATUS_STAT_AVAIL 0x08
|
||||
#define STATUS_INTR 0x01
|
||||
#define STATUS_RESET_FAIL 0xea
|
||||
#define STATUS_CMD_INF 0x04
|
||||
|
||||
#define CTRL_SOFT_RESET 0xe4
|
||||
#define CTRL_HARD_RESET 0x80
|
||||
#define CTRL_EOI 0xe2
|
||||
#define CTRL_ENABLE_DMA 0x02
|
||||
#define CTRL_ENABLE_INTR 0x01
|
||||
#define CTRL_DISABLE_INTR 0x00
|
||||
|
||||
#define ATT_EOI 0x02
|
||||
|
||||
/* bits of word 0 of configuration status block. more info see p.38 of tech ref */
|
||||
#define CONFIG_IS 0x10 /* Invalid Secondary */
|
||||
#define CONFIG_ZD 0x08 /* Zero Defect */
|
||||
#define CONFIG_SF 0x04 /* Skewed Format */
|
||||
#define CONFIG_FR 0x02 /* Removable */
|
||||
#define CONFIG_RT 0x01 /* Retries */
|
||||
|
||||
#define PORT_SYS_A 0x92
|
||||
#define PORT_DMA_FN 0x18
|
||||
#define PORT_DMA_EX 0x1a
|
||||
|
||||
#define ON (unsigned char)0x40
|
||||
#define OFF (unsigned char)~ON
|
||||
#define LITE_ON outb(inb(PORT_SYS_A) | ON,PORT_SYS_A)
|
||||
#define LITE_OFF outb((inb(PORT_SYS_A) & OFF),PORT_SYS_A)
|
||||
|
||||
#define FAIL 0
|
||||
#define SUCCES 1
|
||||
|
||||
#define INT_CMD_COMPLETE 0x01
|
||||
#define INT_CMD_ECC 0x03
|
||||
#define INT_CMD_RETRY 0x05
|
||||
#define INT_CMD_FORMAT 0x06
|
||||
#define INT_CMD_ECC_RETRY 0x07
|
||||
#define INT_CMD_WARNING 0x08
|
||||
#define INT_CMD_ABORT 0x09
|
||||
#define INT_RESET 0x0A
|
||||
#define INT_TRANSFER_REQ 0x0B
|
||||
#define INT_CMD_FAILED 0x0C
|
||||
#define INT_DMA_ERR 0x0D
|
||||
#define INT_CMD_BLK_ERR 0x0E
|
||||
#define INT_ATTN_ERROR 0x0F
|
||||
|
||||
#define DMA_MASK_CHAN 0x90
|
||||
#define DMA_UNMASK_CHAN 0xA0
|
||||
#define DMA_WRITE_ADDR 0x20
|
||||
#define DMA_WRITE_TC 0x40
|
||||
#define DMA_WRITE_MODE 0x70
|
||||
|
||||
#define CMD_GET_DEV_CONFIG 0x09
|
||||
#define CMD_READ 0x4601
|
||||
#define CMD_WRITE 0x4602
|
||||
#define DMA_READ_16 0x4C
|
||||
#define DMA_WRITE_16 0x44
|
||||
|
||||
|
||||
#define MB 1024*1024
|
||||
#define SECT_SIZE 512
|
||||
|
||||
#define ERROR 1
|
||||
#define OK 0
|
||||
|
||||
#define HDIO_GETGEO 0x0301
|
||||
|
||||
#define FALSE 0
|
||||
#define TRUE !FALSE
|
||||
|
||||
struct ps2esdi_geometry {
|
||||
unsigned char heads;
|
||||
unsigned char sectors;
|
||||
unsigned short cylinders;
|
||||
unsigned long start;
|
||||
};
|
||||
|
||||
#endif /* _PS2ESDI_H_ */
|
||||
|
|
@ -87,15 +87,15 @@ DECLARE_PER_CPU(long, dynticks_progress_counter);
|
|||
|
||||
static inline void rcu_enter_nohz(void)
|
||||
{
|
||||
smp_mb(); /* CPUs seeing ++ must see prior RCU read-side crit sects */
|
||||
__get_cpu_var(dynticks_progress_counter)++;
|
||||
WARN_ON(__get_cpu_var(dynticks_progress_counter) & 0x1);
|
||||
mb();
|
||||
}
|
||||
|
||||
static inline void rcu_exit_nohz(void)
|
||||
{
|
||||
mb();
|
||||
__get_cpu_var(dynticks_progress_counter)++;
|
||||
smp_mb(); /* CPUs seeing ++ must see later RCU read-side crit sects */
|
||||
WARN_ON(!(__get_cpu_var(dynticks_progress_counter) & 0x1));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -790,6 +790,7 @@ struct sched_domain {
|
|||
};
|
||||
|
||||
extern void partition_sched_domains(int ndoms_new, cpumask_t *doms_new);
|
||||
extern int arch_reinit_sched_domains(void);
|
||||
|
||||
#endif /* CONFIG_SMP */
|
||||
|
||||
|
|
@ -929,6 +930,9 @@ struct sched_entity {
|
|||
u64 vruntime;
|
||||
u64 prev_sum_exec_runtime;
|
||||
|
||||
u64 last_wakeup;
|
||||
u64 avg_overlap;
|
||||
|
||||
#ifdef CONFIG_SCHEDSTATS
|
||||
u64 wait_start;
|
||||
u64 wait_max;
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@ extern int cap_inode_need_killpriv(struct dentry *dentry);
|
|||
extern int cap_inode_killpriv(struct dentry *dentry);
|
||||
extern int cap_task_post_setuid (uid_t old_ruid, uid_t old_euid, uid_t old_suid, int flags);
|
||||
extern void cap_task_reparent_to_init (struct task_struct *p);
|
||||
extern int cap_task_kill(struct task_struct *p, struct siginfo *info, int sig, u32 secid);
|
||||
extern int cap_task_setscheduler (struct task_struct *p, int policy, struct sched_param *lp);
|
||||
extern int cap_task_setioprio (struct task_struct *p, int ioprio);
|
||||
extern int cap_task_setnice (struct task_struct *p, int nice);
|
||||
|
|
@ -2187,7 +2186,7 @@ static inline int security_task_kill (struct task_struct *p,
|
|||
struct siginfo *info, int sig,
|
||||
u32 secid)
|
||||
{
|
||||
return cap_task_kill(p, info, sig, secid);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int security_task_wait (struct task_struct *p)
|
||||
|
|
|
|||
|
|
@ -50,6 +50,8 @@
|
|||
for_each_online_node(node) \
|
||||
if (nr_cpus_node(node))
|
||||
|
||||
void arch_update_cpu_topology(void);
|
||||
|
||||
/* Conform to ACPI 2.0 SLIT distance definitions */
|
||||
#define LOCAL_DISTANCE 10
|
||||
#define REMOTE_DISTANCE 20
|
||||
|
|
@ -138,7 +140,6 @@
|
|||
| SD_BALANCE_FORK \
|
||||
| SD_BALANCE_EXEC \
|
||||
| SD_WAKE_AFFINE \
|
||||
| SD_WAKE_IDLE \
|
||||
| SD_SHARE_PKG_RESOURCES\
|
||||
| BALANCE_FOR_MC_POWER, \
|
||||
.last_balance = jiffies, \
|
||||
|
|
|
|||
|
|
@ -9,3 +9,6 @@
|
|||
|
||||
/* device can't resume correctly so reset it instead */
|
||||
#define USB_QUIRK_RESET_RESUME 0x00000002
|
||||
|
||||
/* device can't handle Set-Interface requests */
|
||||
#define USB_QUIRK_NO_SET_INTF 0x00000004
|
||||
|
|
|
|||
|
|
@ -50,7 +50,9 @@
|
|||
US_FLAG(CAPACITY_HEURISTICS, 0x00001000) \
|
||||
/* sometimes sizes is too big */ \
|
||||
US_FLAG(MAX_SECTORS_MIN,0x00002000) \
|
||||
/* Sets max_sectors to arch min */
|
||||
/* Sets max_sectors to arch min */ \
|
||||
US_FLAG(BULK_IGNORE_TAG,0x00004000) \
|
||||
/* Ignore tag mismatch in bulk operations */
|
||||
|
||||
|
||||
#define US_FLAG(name, value) US_FL_##name = value ,
|
||||
|
|
|
|||
|
|
@ -43,8 +43,9 @@ struct virtqueue
|
|||
* vq: the struct virtqueue we're talking about.
|
||||
* @enable_cb: restart callbacks after disable_cb.
|
||||
* vq: the struct virtqueue we're talking about.
|
||||
* This returns "false" (and doesn't re-enable) if there are pending
|
||||
* buffers in the queue, to avoid a race.
|
||||
* This re-enables callbacks; it returns "false" if there are pending
|
||||
* buffers in the queue, to detect a possible race between the driver
|
||||
* checking for more work, and enabling callbacks.
|
||||
*
|
||||
* Locking rules are straightforward: the driver is responsible for
|
||||
* locking. No two operations may be invoked simultaneously.
|
||||
|
|
|
|||
Loading…
Reference in a new issue