Automatic merge with /usr/src/ntfs-2.6.git.

14 files changed, 31 insertions, 196 deletions

diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h
index b5e54a9e9f..51f0fe0ac1 100644
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -1505,6 +1505,7 @@
 #define PSSR_OTGPH      (1 << 6)        /* OTG Peripheral control Hold */
 #define PSSR_RDH        (1 << 5)        /* Read Disable Hold */
 #define PSSR_PH         (1 << 4)        /* Peripheral Control Hold */
+#define PSSR_STS        (1 << 3)        /* Standby Mode Status */
 #define PSSR_VFS        (1 << 2)        /* VDD Fault Status */
 #define PSSR_BFS        (1 << 1)        /* Battery Fault Status */
 #define PSSR_SSS        (1 << 0)        /* Software Sleep Status */
@@ -1965,6 +1966,7 @@
 #define MECR_NOS        (1 << 0)        /* Number Of Sockets: 0 -> 1 sock, 1 -> 2 sock */
 #define MECR_CIT        (1 << 1)        /* Card Is There: 0 -> no card, 1 -> card inserted */
 
+#define MDREFR_K0DB4    (1 << 29)       /* SDCLK0 Divide by 4 Control/Status */
 #define MDREFR_K2FREE   (1 << 25)       /* SDRAM Free-Running Control */
 #define MDREFR_K1FREE   (1 << 24)       /* SDRAM Free-Running Control */
 #define MDREFR_K0FREE   (1 << 23)       /* SDRAM Free-Running Control */
diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index 3a32e929ec..a2fbb6558c 100644
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -54,38 +54,6 @@ const struct machine_desc __mach_desc_##_type	\
         .nr             = MACH_TYPE_##_type,    \
         .name           = _name,
 
-#define MAINTAINER(n)
-
-#define BOOT_MEM(_pram,_pio,_vio)               \
-        .phys_ram       = _pram,                \
-        .phys_io        = _pio,                 \
-        .io_pg_offst    = ((_vio)>>18)&0xfffc,
-
-#define BOOT_PARAMS(_params)                    \
-        .param_offset   = _params,
-
-#define VIDEO(_start,_end)                      \
-        .video_start    = _start,               \
-        .video_end      = _end,
-
-#define DISABLE_PARPORT(_n)                     \
-        .reserve_lp##_n = 1,
-
-#define SOFT_REBOOT                             \
-        .soft_reboot    = 1,
-
-#define FIXUP(_func)                            \
-        .fixup          = _func,
-
-#define MAPIO(_func)                            \
-        .map_io         = _func,
-
-#define INITIRQ(_func)                          \
-        .init_irq       = _func,
-
-#define INIT_MACHINE(_func)                     \
-        .init_machine   = _func,
-
 #define MACHINE_END                             \
 };
 
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index cdf49f442f..2f44b20442 100644
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -85,7 +85,9 @@ struct pt_regs;
 void die(const char *msg, struct pt_regs *regs, int err)
                 __attribute__((noreturn));
 
-void die_if_kernel(const char *str, struct pt_regs *regs, int err);
+struct siginfo;
+void notify_die(const char *str, struct pt_regs *regs, struct siginfo *info,
+                unsigned long err, unsigned long trap);
 
 void hook_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
                                        struct pt_regs *),
diff --git a/include/asm-i386/i8253.h b/include/asm-i386/i8253.h
new file mode 100644
index 0000000000..015d8df076
--- /dev/null
+++ b/include/asm-i386/i8253.h
@@ -0,0 +1,6 @@
+#ifndef __ASM_I8253_H__
+#define __ASM_I8253_H__
+
+extern spinlock_t i8253_lock;
+
+#endif  /* __ASM_I8253_H__ */
diff --git a/include/asm-i386/mach-default/do_timer.h b/include/asm-i386/mach-default/do_timer.h
index 03dd13a48a..56211414fc 100644
--- a/include/asm-i386/mach-default/do_timer.h
+++ b/include/asm-i386/mach-default/do_timer.h
@@ -1,6 +1,7 @@
 /* defines for inline arch setup functions */
 
 #include <asm/apic.h>
+#include <asm/i8259.h>
 
 /**
  * do_timer_interrupt_hook - hook into timer tick
diff --git a/include/asm-ppc64/iSeries/ItLpQueue.h b/include/asm-ppc64/iSeries/ItLpQueue.h
index 393299e04d..69b26ad741 100644
--- a/include/asm-ppc64/iSeries/ItLpQueue.h
+++ b/include/asm-ppc64/iSeries/ItLpQueue.h
@@ -41,7 +41,7 @@ struct HvLpEvent;
 #define LpEventMaxSize          256
 #define LpEventAlign            64
 
-struct ItLpQueue {
+struct hvlpevent_queue {
 /*
  * The xSlicCurEventPtr is the pointer to the next event stack entry
  * that will become valid.  The OS must peek at this entry to determine
@@ -69,16 +69,13 @@ struct ItLpQueue {
         char    *xSlicEventStackPtr;    // 0x20
         u8      xIndex;                 // 0x28 unique sequential index.
         u8      xSlicRsvd[3];           // 0x29-2b
-        u32     xInUseWord;             // 0x2C
-        u64     xLpIntCount;            // 0x30 Total Lp Int msgs processed
-        u64     xLpIntCountByType[9];   // 0x38-0x7F Event counts by type
+        spinlock_t      lock;
 };
 
-extern struct ItLpQueue xItLpQueue;
+extern struct hvlpevent_queue hvlpevent_queue;
 
-extern struct HvLpEvent *ItLpQueue_getNextLpEvent(struct ItLpQueue *);
-extern int ItLpQueue_isLpIntPending(struct ItLpQueue *);
-extern unsigned ItLpQueue_process(struct ItLpQueue *, struct pt_regs *);
-extern void ItLpQueue_clearValid(struct HvLpEvent *);
+extern int hvlpevent_is_pending(void);
+extern void process_hvlpevents(struct pt_regs *);
+extern void setup_hvlpevent_queue(void);
 
 #endif /* _ITLPQUEUE_H */
diff --git a/include/asm-ppc64/paca.h b/include/asm-ppc64/paca.h
index ae76cae148..2f0f36f73d 100644
--- a/include/asm-ppc64/paca.h
+++ b/include/asm-ppc64/paca.h
@@ -20,7 +20,6 @@
 #include        <asm/types.h>
 #include        <asm/lppaca.h>
 #include        <asm/iSeries/ItLpRegSave.h>
-#include        <asm/iSeries/ItLpQueue.h>
 #include        <asm/mmu.h>
 
 register struct paca_struct *local_paca asm("r13");
@@ -62,7 +61,6 @@ struct paca_struct {
         u16 paca_index;                 /* Logical processor number */
 
         u32 default_decr;               /* Default decrementer value */
-        struct ItLpQueue *lpqueue_ptr;  /* LpQueue handled by this CPU */
         u64 kernel_toc;                 /* Kernel TOC address */
         u64 stab_real;                  /* Absolute address of segment table */
         u64 stab_addr;                  /* Virtual address of segment table */
@@ -91,7 +89,6 @@ struct paca_struct {
         u64 next_jiffy_update_tb;       /* TB value for next jiffy update */
         u64 saved_r1;                   /* r1 save for RTAS calls */
         u64 saved_msr;                  /* MSR saved here by enter_rtas */
-        u32 lpevent_count;              /* lpevents processed  */
         u8 proc_enabled;                /* irq soft-enable flag */
 
         /* not yet used */
diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h
index b4a9f05a93..864cae7e1f 100644
--- a/include/asm-s390/system.h
+++ b/include/asm-s390/system.h
@@ -107,11 +107,9 @@ static inline void restore_access_regs(unsigned int *acrs)
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
 extern void account_user_vtime(struct task_struct *);
 extern void account_system_vtime(struct task_struct *);
-#else
-#define account_system_vtime(prev) do { } while (0)
 #endif
 
-#define finish_arch_switch(rq, prev) do {                                    \
+#define finish_arch_switch(prev) do {                                        \
         set_fs(current->thread.mm_segment);                                  \
         account_system_vtime(prev);                                          \
 } while (0)
diff --git a/include/asm-x86_64/io_apic.h b/include/asm-x86_64/io_apic.h
index 3257374900..a8babd2bbe 100644
--- a/include/asm-x86_64/io_apic.h
+++ b/include/asm-x86_64/io_apic.h
@@ -217,4 +217,6 @@ extern int assign_irq_vector(int irq);
 
 void enable_NMI_through_LVT0 (void * dummy);
 
+extern spinlock_t i8259A_lock;
+
 #endif
diff --git a/include/asm-xtensa/delay.h b/include/asm-xtensa/delay.h
index 6359c55e77..0a123d53a6 100644
--- a/include/asm-xtensa/delay.h
+++ b/include/asm-xtensa/delay.h
@@ -21,7 +21,7 @@ extern unsigned long loops_per_jiffy;
 extern __inline__ void __delay(unsigned long loops)
 {
   /* 2 cycles per loop. */
-  __asm__ __volatile__ ("1: addi %0, %0, -2; bgeui %0, 1, 1b"
+  __asm__ __volatile__ ("1: addi %0, %0, -2; bgeui %0, 2, 1b"
                         : "=r" (loops) : "0" (loops));
 }
 
diff --git a/include/asm-xtensa/errno.h b/include/asm-xtensa/errno.h
index ced5194d27..a0f3b96b79 100644
--- a/include/asm-xtensa/errno.h
+++ b/include/asm-xtensa/errno.h
@@ -11,132 +11,6 @@
 #ifndef _XTENSA_ERRNO_H
 #define _XTENSA_ERRNO_H
 
-#define EPERM            1      /* Operation not permitted */
-#define ENOENT           2      /* No such file or directory */
-#define ESRCH            3      /* No such process */
-#define EINTR            4      /* Interrupted system call */
-#define EIO              5      /* I/O error */
-#define ENXIO            6      /* No such device or address */
-#define E2BIG            7      /* Arg list too long */
-#define ENOEXEC          8      /* Exec format error */
-#define EBADF            9      /* Bad file number */
-#define ECHILD          10      /* No child processes */
-#define EAGAIN          11      /* Try again */
-#define ENOMEM          12      /* Out of memory */
-#define EACCES          13      /* Permission denied */
-#define EFAULT          14      /* Bad address */
-#define ENOTBLK         15      /* Block device required */
-#define EBUSY           16      /* Device or resource busy */
-#define EEXIST          17      /* File exists */
-#define EXDEV           18      /* Cross-device link */
-#define ENODEV          19      /* No such device */
-#define ENOTDIR         20      /* Not a directory */
-#define EISDIR          21      /* Is a directory */
-#define EINVAL          22      /* Invalid argument */
-#define ENFILE          23      /* File table overflow */
-#define EMFILE          24      /* Too many open files */
-#define ENOTTY          25      /* Not a typewriter */
-#define ETXTBSY         26      /* Text file busy */
-#define EFBIG           27      /* File too large */
-#define ENOSPC          28      /* No space left on device */
-#define ESPIPE          29      /* Illegal seek */
-#define EROFS           30      /* Read-only file system */
-#define EMLINK          31      /* Too many links */
-#define EPIPE           32      /* Broken pipe */
-#define EDOM            33      /* Math argument out of domain of func */
-#define ERANGE          34      /* Math result not representable */
-#define EDEADLK         35      /* Resource deadlock would occur */
-#define ENAMETOOLONG    36      /* File name too long */
-#define ENOLCK          37      /* No record locks available */
-#define ENOSYS          38      /* Function not implemented */
-#define ENOTEMPTY       39      /* Directory not empty */
-#define ELOOP           40      /* Too many symbolic links encountered */
-#define EWOULDBLOCK     EAGAIN  /* Operation would block */
-#define ENOMSG          42      /* No message of desired type */
-#define EIDRM           43      /* Identifier removed */
-#define ECHRNG          44      /* Channel number out of range */
-#define EL2NSYNC        45      /* Level 2 not synchronized */
-#define EL3HLT          46      /* Level 3 halted */
-#define EL3RST          47      /* Level 3 reset */
-#define ELNRNG          48      /* Link number out of range */
-#define EUNATCH         49      /* Protocol driver not attached */
-#define ENOCSI          50      /* No CSI structure available */
-#define EL2HLT          51      /* Level 2 halted */
-#define EBADE           52      /* Invalid exchange */
-#define EBADR           53      /* Invalid request descriptor */
-#define EXFULL          54      /* Exchange full */
-#define ENOANO          55      /* No anode */
-#define EBADRQC         56      /* Invalid request code */
-#define EBADSLT         57      /* Invalid slot */
-
-#define EDEADLOCK       EDEADLK
-
-#define EBFONT          59      /* Bad font file format */
-#define ENOSTR          60      /* Device not a stream */
-#define ENODATA         61      /* No data available */
-#define ETIME           62      /* Timer expired */
-#define ENOSR           63      /* Out of streams resources */
-#define ENONET          64      /* Machine is not on the network */
-#define ENOPKG          65      /* Package not installed */
-#define EREMOTE         66      /* Object is remote */
-#define ENOLINK         67      /* Link has been severed */
-#define EADV            68      /* Advertise error */
-#define ESRMNT          69      /* Srmount error */
-#define ECOMM           70      /* Communication error on send */
-#define EPROTO          71      /* Protocol error */
-#define EMULTIHOP       72      /* Multihop attempted */
-#define EDOTDOT         73      /* RFS specific error */
-#define EBADMSG         74      /* Not a data message */
-#define EOVERFLOW       75      /* Value too large for defined data type */
-#define ENOTUNIQ        76      /* Name not unique on network */
-#define EBADFD          77      /* File descriptor in bad state */
-#define EREMCHG         78      /* Remote address changed */
-#define ELIBACC         79      /* Can not access a needed shared library */
-#define ELIBBAD         80      /* Accessing a corrupted shared library */
-#define ELIBSCN         81      /* .lib section in a.out corrupted */
-#define ELIBMAX         82      /* Attempting to link in too many shared libraries */
-#define ELIBEXEC        83      /* Cannot exec a shared library directly */
-#define EILSEQ          84      /* Illegal byte sequence */
-#define ERESTART        85      /* Interrupted system call should be restarted */
-#define ESTRPIPE        86      /* Streams pipe error */
-#define EUSERS          87      /* Too many users */
-#define ENOTSOCK        88      /* Socket operation on non-socket */
-#define EDESTADDRREQ    89      /* Destination address required */
-#define EMSGSIZE        90      /* Message too long */
-#define EPROTOTYPE      91      /* Protocol wrong type for socket */
-#define ENOPROTOOPT     92      /* Protocol not available */
-#define EPROTONOSUPPORT 93      /* Protocol not supported */
-#define ESOCKTNOSUPPORT 94      /* Socket type not supported */
-#define EOPNOTSUPP      95      /* Operation not supported on transport endpoint */
-#define EPFNOSUPPORT    96      /* Protocol family not supported */
-#define EAFNOSUPPORT    97      /* Address family not supported by protocol */
-#define EADDRINUSE      98      /* Address already in use */
-#define EADDRNOTAVAIL   99      /* Cannot assign requested address */
-#define ENETDOWN        100     /* Network is down */
-#define ENETUNREACH     101     /* Network is unreachable */
-#define ENETRESET       102     /* Network dropped connection because of reset */
-#define ECONNABORTED    103     /* Software caused connection abort */
-#define ECONNRESET      104     /* Connection reset by peer */
-#define ENOBUFS         105     /* No buffer space available */
-#define EISCONN         106     /* Transport endpoint is already connected */
-#define ENOTCONN        107     /* Transport endpoint is not connected */
-#define ESHUTDOWN       108     /* Cannot send after transport endpoint shutdown */
-#define ETOOMANYREFS    109     /* Too many references: cannot splice */
-#define ETIMEDOUT       110     /* Connection timed out */
-#define ECONNREFUSED    111     /* Connection refused */
-#define EHOSTDOWN       112     /* Host is down */
-#define EHOSTUNREACH    113     /* No route to host */
-#define EALREADY        114     /* Operation already in progress */
-#define EINPROGRESS     115     /* Operation now in progress */
-#define ESTALE          116     /* Stale NFS file handle */
-#define EUCLEAN         117     /* Structure needs cleaning */
-#define ENOTNAM         118     /* Not a XENIX named type file */
-#define ENAVAIL         119     /* No XENIX semaphores available */
-#define EISNAM          120     /* Is a named type file */
-#define EREMOTEIO       121     /* Remote I/O error */
-#define EDQUOT          122     /* Quota exceeded */
-
-#define ENOMEDIUM       123     /* No medium found */
-#define EMEDIUMTYPE     124     /* Wrong medium type */
+#include <asm-generic/errno.h>
 
 #endif  /* _XTENSA_ERRNO_H */
diff --git a/include/asm-xtensa/ipc.h b/include/asm-xtensa/ipc.h
index d37bdb4d4c..a9eed4e21c 100644
--- a/include/asm-xtensa/ipc.h
+++ b/include/asm-xtensa/ipc.h
@@ -11,24 +11,6 @@
 #ifndef _XTENSA_IPC_H
 #define _XTENSA_IPC_H
 
-struct ipc_kludge {
-        struct msgbuf __user *msgp;
-        long msgtyp;
-};
-
-#define SEMOP            1
-#define SEMGET           2
-#define SEMCTL           3
-#define SEMTIMEDOP       4
-#define MSGSND          11
-#define MSGRCV          12
-#define MSGGET          13
-#define MSGCTL          14
-#define SHMAT           21
-#define SHMDT           22
-#define SHMGET          23
-#define SHMCTL          24
-
-#define IPCCALL(version,op)     ((version)<<16 | (op))
+#include <asm-generic/ipc.h>
 
 #endif  /* _XTENSA_IPC_H */
diff --git a/include/linux/device.h b/include/linux/device.h
index 7b781a72b2..f378c846e6 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -69,7 +69,7 @@ struct bus_type {
 extern int bus_register(struct bus_type * bus);
 extern void bus_unregister(struct bus_type * bus);
 
-extern int bus_rescan_devices(struct bus_type * bus);
+extern void bus_rescan_devices(struct bus_type * bus);
 
 extern struct bus_type * get_bus(struct bus_type * bus);
 extern void put_bus(struct bus_type * bus);
@@ -80,6 +80,8 @@ extern struct bus_type * find_bus(char * name);
 
 int bus_for_each_dev(struct bus_type * bus, struct device * start, void * data,
                      int (*fn)(struct device *, void *));
+struct device * bus_find_device(struct bus_type *bus, struct device *start,
+                                void *data, int (*match)(struct device *, void *));
 
 int bus_for_each_drv(struct bus_type * bus, struct device_driver * start, 
                      void * data, int (*fn)(struct device_driver *, void *));
@@ -142,6 +144,9 @@ extern void driver_remove_file(struct device_driver *, struct driver_attribute *
 
 extern int driver_for_each_device(struct device_driver * drv, struct device * start,
                                   void * data, int (*fn)(struct device *, void *));
+struct device * driver_find_device(struct device_driver *drv,
+                                   struct device *start, void *data,
+                                   int (*match)(struct device *, void *));
 
 
 /*
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c3ee1ae454..27348c22da 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1238,6 +1238,7 @@
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE   0x0265
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA  0x0266
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2 0x0267
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE   0x036E
 #define PCI_DEVICE_ID_NVIDIA_NVENET_12          0x0268
 #define PCI_DEVICE_ID_NVIDIA_NVENET_13          0x0269
 #define PCI_DEVICE_ID_NVIDIA_MCP51_AUDIO        0x026B