Merge groveronline.com:/root/bk/linux-2.5

into groveronline.com:/root/bk/linux-acpi

6 files changed, 16 insertions, 11 deletions

diff --git a/include/asm-alpha/timex.h b/include/asm-alpha/timex.h
index 2576553b348e..f3737a1ee698 100644
--- a/include/asm-alpha/timex.h
+++ b/include/asm-alpha/timex.h
@@ -6,7 +6,9 @@
 #ifndef _ASMALPHA_TIMEX_H
 #define _ASMALPHA_TIMEX_H
 
-#define CLOCK_TICK_RATE	1193180 /* Underlying HZ */
+/* With only one or two oddballs, we use the RTC as the ticker, selecting
+   the 32.768kHz reference clock, which nicely divides down to our HZ.  */
+#define CLOCK_TICK_RATE	32768
 
 /*
  * Standard way to access the cycle counter.
diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h
index 38faced4d0a2..3035b700f454 100644
--- a/include/asm-alpha/unistd.h
+++ b/include/asm-alpha/unistd.h
@@ -359,7 +359,8 @@
 #define __NR_clock_getres		421
 #define __NR_clock_nanosleep		422
 #define __NR_semtimedop			423
-#define NR_SYSCALLS			424
+#define __NR_tgkill			424
+#define NR_SYSCALLS			425
 
 #if defined(__GNUC__)
 
diff --git a/include/asm-i386/hw_irq.h b/include/asm-i386/hw_irq.h
index 65e0461fd8be..30e4cfa8395b 100644
--- a/include/asm-i386/hw_irq.h
+++ b/include/asm-i386/hw_irq.h
@@ -107,7 +107,7 @@ static inline void x86_do_profile(struct pt_regs * regs)
 	atomic_inc((atomic_t *)&prof_buffer[eip]);
 }
  
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP)
+#if defined(CONFIG_X86_IO_APIC)
 static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i)
 {
 	if (IO_APIC_IRQ(i))
diff --git a/include/linux/namespace.h b/include/linux/namespace.h
index e7b313a202b6..b5699538afac 100644
--- a/include/linux/namespace.h
+++ b/include/linux/namespace.h
@@ -2,7 +2,7 @@
 #define _NAMESPACE_H_
 #ifdef __KERNEL__
 
-#include <linux/dcache.h>
+#include <linux/mount.h>
 #include <linux/sched.h>
 
 struct namespace {
@@ -19,9 +19,9 @@ static inline void put_namespace(struct namespace *namespace)
 {
 	if (atomic_dec_and_test(&namespace->count)) {
 		down_write(&namespace->sem);
-		spin_lock(&dcache_lock);
+		spin_lock(&vfsmount_lock);
 		umount_tree(namespace->root);
-		spin_unlock(&dcache_lock);
+		spin_unlock(&vfsmount_lock);
 		up_write(&namespace->sem);
 		kfree(namespace);
 	}
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a219c58ad88e..9093629ff88a 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -456,10 +456,10 @@ struct pci_bus {
 	void		*sysdata;	/* hook for sys-specific extension */
 	struct proc_dir_entry *procdir;	/* directory entry in /proc/bus/pci */
 
-	unsigned char	number;		/* bus number */
-	unsigned char	primary;	/* number of primary bridge */
-	unsigned char	secondary;	/* number of secondary bridge */
-	unsigned char	subordinate;	/* max number of subordinate buses */
+	unsigned int	number;		/* bus number */
+	unsigned int	primary;	/* number of primary bridge */
+	unsigned int	secondary;	/* number of secondary bridge */
+	unsigned int	subordinate;	/* max number of subordinate buses */
 
 	char		name[48];
 
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index c0891855a0b1..24cb380be518 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -170,7 +170,6 @@ struct region_t;
 struct pcmcia_socket {
 	struct module			*owner;
 	spinlock_t			lock;
-	struct pccard_operations *	ss_entry;
 	socket_state_t			socket;
 	u_int				state;
 	u_short				functions;
@@ -207,6 +206,9 @@ struct pcmcia_socket {
 	u_char				pci_irq;
 	struct pci_dev *		cb_dev;
 
+	/* socket operations */
+	struct pccard_operations *	ops;
+
 	/* state thread */
 	struct semaphore		skt_sem;	/* protects socket h/w state */