Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

10 files changed, 31 insertions, 112 deletions

diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
index f01fb50..a6e85f44 100644
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
@@ -3,4 +3,3 @@ generic-y += clkdev.h
 
 generic-y += exec.h
 generic-y += trace_clock.h
-generic-y += preempt.h
diff --git a/arch/alpha/include/asm/machvec.h b/arch/alpha/include/asm/machvec.h
index 75cb364..72dbf23 100644
--- a/arch/alpha/include/asm/machvec.h
+++ b/arch/alpha/include/asm/machvec.h
@@ -33,7 +33,6 @@ struct alpha_machine_vector
 
 	int nr_irqs;
 	int rtc_port;
-	int rtc_boot_cpu_only;
 	unsigned int max_asn;
 	unsigned long max_isa_dma_address;
 	unsigned long irq_probe_mask;
@@ -96,6 +95,9 @@ struct alpha_machine_vector
 
 	struct _alpha_agp_info *(*agp_info)(void);
 
+	unsigned int (*rtc_get_time)(struct rtc_time *);
+	int (*rtc_set_time)(struct rtc_time *);
+
 	const char *vector_name;
 
 	/* NUMA information */
@@ -124,19 +126,13 @@ extern struct alpha_machine_vector alpha_mv;
 
 #ifdef CONFIG_ALPHA_GENERIC
 extern int alpha_using_srm;
-extern int alpha_using_qemu;
 #else
-# ifdef CONFIG_ALPHA_SRM
-#  define alpha_using_srm 1
-# else
-#  define alpha_using_srm 0
-# endif
-# ifdef CONFIG_ALPHA_QEMU
-#  define alpha_using_qemu 1
-# else
-#  define alpha_using_qemu 0
-# endif
+#ifdef CONFIG_ALPHA_SRM
+#define alpha_using_srm 1
+#else
+#define alpha_using_srm 0
+#endif
 #endif /* GENERIC */
 
-#endif /* __KERNEL__ */
+#endif
 #endif /* __ALPHA_MACHVEC_H */
diff --git a/arch/alpha/include/asm/pal.h b/arch/alpha/include/asm/pal.h
index 5422a47..6fcd2b5 100644
--- a/arch/alpha/include/asm/pal.h
+++ b/arch/alpha/include/asm/pal.h
@@ -89,7 +89,6 @@ __CALL_PAL_W1(wrmces, unsigned long);
 __CALL_PAL_RW2(wrperfmon, unsigned long, unsigned long, unsigned long);
 __CALL_PAL_W1(wrusp, unsigned long);
 __CALL_PAL_W1(wrvptptr, unsigned long);
-__CALL_PAL_RW1(wtint, unsigned long, unsigned long);
 
 /*
  * TB routines..
@@ -112,75 +111,5 @@ __CALL_PAL_RW1(wtint, unsigned long, unsigned long);
 #define tbiap()		__tbi(-1, /* no second argument */)
 #define tbia()		__tbi(-2, /* no second argument */)
 
-/*
- * QEMU Cserv routines..
- */
-
-static inline unsigned long
-qemu_get_walltime(void)
-{
-	register unsigned long v0 __asm__("$0");
-	register unsigned long a0 __asm__("$16") = 3;
-
-	asm("call_pal %2 # cserve get_time"
-	    : "=r"(v0), "+r"(a0)
-	    : "i"(PAL_cserve)
-	    : "$17", "$18", "$19", "$20", "$21");
-
-	return v0;
-}
-
-static inline unsigned long
-qemu_get_alarm(void)
-{
-	register unsigned long v0 __asm__("$0");
-	register unsigned long a0 __asm__("$16") = 4;
-
-	asm("call_pal %2 # cserve get_alarm"
-	    : "=r"(v0), "+r"(a0)
-	    : "i"(PAL_cserve)
-	    : "$17", "$18", "$19", "$20", "$21");
-
-	return v0;
-}
-
-static inline void
-qemu_set_alarm_rel(unsigned long expire)
-{
-	register unsigned long a0 __asm__("$16") = 5;
-	register unsigned long a1 __asm__("$17") = expire;
-
-	asm volatile("call_pal %2 # cserve set_alarm_rel"
-		     : "+r"(a0), "+r"(a1)
-		     : "i"(PAL_cserve)
-		     : "$0", "$18", "$19", "$20", "$21");
-}
-
-static inline void
-qemu_set_alarm_abs(unsigned long expire)
-{
-	register unsigned long a0 __asm__("$16") = 6;
-	register unsigned long a1 __asm__("$17") = expire;
-
-	asm volatile("call_pal %2 # cserve set_alarm_abs"
-		     : "+r"(a0), "+r"(a1)
-		     : "i"(PAL_cserve)
-		     : "$0", "$18", "$19", "$20", "$21");
-}
-
-static inline unsigned long
-qemu_get_vmtime(void)
-{
-	register unsigned long v0 __asm__("$0");
-	register unsigned long a0 __asm__("$16") = 7;
-
-	asm("call_pal %2 # cserve get_time"
-	    : "=r"(v0), "+r"(a0)
-	    : "i"(PAL_cserve)
-	    : "$17", "$18", "$19", "$20", "$21");
-
-	return v0;
-}
-
 #endif /* !__ASSEMBLY__ */
 #endif /* __ALPHA_PAL_H */
diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
index aab14a0..bc2a0da 100644
--- a/arch/alpha/include/asm/pgalloc.h
+++ b/arch/alpha/include/asm/pgalloc.h
@@ -72,10 +72,7 @@ pte_alloc_one(struct mm_struct *mm, unsigned long address)
 	if (!pte)
 		return NULL;
 	page = virt_to_page(pte);
-	if (!pgtable_page_ctor(page)) {
-		__free_page(page);
-		return NULL;
-	}
+	pgtable_page_ctor(page);
 	return page;
 }
 
diff --git a/arch/alpha/include/asm/rtc.h b/arch/alpha/include/asm/rtc.h
index f71c3b0..d70408d 100644
--- a/arch/alpha/include/asm/rtc.h
+++ b/arch/alpha/include/asm/rtc.h
@@ -1 +1,12 @@
+#ifndef _ALPHA_RTC_H
+#define _ALPHA_RTC_H
+
+#if defined(CONFIG_ALPHA_MARVEL) && defined(CONFIG_SMP) \
+ || defined(CONFIG_ALPHA_GENERIC)
+# define get_rtc_time		alpha_mv.rtc_get_time
+# define set_rtc_time		alpha_mv.rtc_set_time
+#endif
+
 #include <asm-generic/rtc.h>
+
+#endif
diff --git a/arch/alpha/include/asm/string.h b/arch/alpha/include/asm/string.h
index c2911f5..b02b8a2 100644
--- a/arch/alpha/include/asm/string.h
+++ b/arch/alpha/include/asm/string.h
@@ -22,27 +22,15 @@ extern void * __memcpy(void *, const void *, size_t);
 
 #define __HAVE_ARCH_MEMSET
 extern void * __constant_c_memset(void *, unsigned long, size_t);
-extern void * ___memset(void *, int, size_t);
 extern void * __memset(void *, int, size_t);
 extern void * memset(void *, int, size_t);
 
-/* For gcc 3.x, we cannot have the inline function named "memset" because
-   the __builtin_memset will attempt to resolve to the inline as well,
-   leading to a "sorry" about unimplemented recursive inlining.  */
-extern inline void *__memset(void *s, int c, size_t n)
-{
-	if (__builtin_constant_p(c)) {
-		if (__builtin_constant_p(n)) {
-			return __builtin_memset(s, c, n);
-		} else {
-			unsigned long c8 = (c & 0xff) * 0x0101010101010101UL;
-			return __constant_c_memset(s, c8, n);
-		}
-	}
-	return ___memset(s, c, n);
-}
-
-#define memset __memset
+#define memset(s, c, n)							    \
+(__builtin_constant_p(c)						    \
+ ? (__builtin_constant_p(n) && (c) == 0					    \
+    ? __builtin_memset((s),0,(n)) 					    \
+    : __constant_c_memset((s),0x0101010101010101UL*(unsigned char)(c),(n))) \
+ : __memset((s),(c),(n)))
 
 #define __HAVE_ARCH_STRCPY
 extern char * strcpy(char *,const char *);
diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/thread_info.h
index 453597b..52cd2a4 100644
--- a/arch/alpha/include/asm/thread_info.h
+++ b/arch/alpha/include/asm/thread_info.h
@@ -58,6 +58,8 @@ register struct thread_info *__current_thread_info __asm__("$8");
 #define THREAD_SIZE_ORDER 1
 #define THREAD_SIZE (2*PAGE_SIZE)
 
+#define PREEMPT_ACTIVE		0x40000000
+
 /*
  * Thread information flags:
  * - these are process state flags and used from assembly
diff --git a/arch/alpha/include/uapi/asm/errno.h b/arch/alpha/include/uapi/asm/errno.h
index 17f92aa..e5f29ca 100644
--- a/arch/alpha/include/uapi/asm/errno.h
+++ b/arch/alpha/include/uapi/asm/errno.h
@@ -43,7 +43,7 @@
 
 #define	EUSERS		68	/* Too many users */
 #define	EDQUOT		69	/* Quota exceeded */
-#define	ESTALE		70	/* Stale file handle */
+#define	ESTALE		70	/* Stale NFS file handle */
 #define	EREMOTE		71	/* Object is remote */
 
 #define	ENOLCK		77	/* No record locks available */
diff --git a/arch/alpha/include/uapi/asm/pal.h b/arch/alpha/include/uapi/asm/pal.h
index dfc8140..3c0ce08 100644
--- a/arch/alpha/include/uapi/asm/pal.h
+++ b/arch/alpha/include/uapi/asm/pal.h
@@ -46,7 +46,6 @@
 #define PAL_rdusp	58
 #define PAL_whami	60
 #define PAL_retsys	61
-#define PAL_wtint	62
 #define PAL_rti		63
 
 
diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h
index e3a1491..467de01 100644
--- a/arch/alpha/include/uapi/asm/socket.h
+++ b/arch/alpha/include/uapi/asm/socket.h
@@ -81,8 +81,6 @@
 
 #define SO_SELECT_ERR_QUEUE	45
 
-#define SO_BUSY_POLL		46
-
-#define SO_MAX_PACING_RATE	47
+#define SO_BUSY_POLL			46
 
 #endif /* _UAPI_ASM_SOCKET_H */