Merge bk://linux.bkbits.net/linux-2.5

into maxwell.earthlink.net:/usr/src/linus-2.5

fs/mpage.c

@@ -595,6 +595,10 @@ mpage_writepages(struct address_space *mapping,
 					test_clear_page_dirty(page)) {
 			if (writepage) {
 				ret = (*writepage)(page);
+				if (ret == -EAGAIN) {
+					__set_page_dirty_nobuffers(page);
+					ret = 0;
+				}
 			} else {
 				bio = mpage_writepage(bio, page, get_block,
 						&last_block_in_bio, &ret);
@@ -605,10 +609,6 @@ mpage_writepages(struct address_space *mapping,
 					pagevec_deactivate_inactive(&pvec);
 				page = NULL;
 			}
-			if (ret == -EAGAIN && page) {
-				__set_page_dirty_nobuffers(page);
-				ret = 0;
-			}
 			if (ret || (--(wbc->nr_to_write) <= 0))
 				done = 1;
 			if (wbc->nonblocking && bdi_write_congested(bdi)) {

fs/proc/kcore.c

@@ -99,11 +99,7 @@ static ssize_t read_kcore(struct file *file, char *buf, size_t count, loff_t *pp
 }
 #else /* CONFIG_KCORE_AOUT */
 
-#if VMALLOC_START < PAGE_OFFSET
-#define	KCORE_BASE	VMALLOC_START
-#else
 #define	KCORE_BASE	PAGE_OFFSET
-#endif
 
 #define roundup(x, y)  ((((x)+((y)-1))/(y))*(y))
 

include/asm-sparc64/system.h

@@ -84,6 +84,7 @@ enum sparc_cpu {
 	membar("#LoadLoad | #LoadStore | #StoreStore | #StoreLoad");
 #define rmb()		membar("#LoadLoad")
 #define wmb()		membar("#StoreStore")
+#define read_barrier_depends()		do { } while(0)
 #define set_mb(__var, __value) \
 	do { __var = __value; membar("#StoreLoad | #StoreStore"); } while(0)
 #define set_wmb(__var, __value) \
@@ -93,10 +94,12 @@ enum sparc_cpu {
 #define smp_mb()	mb()
 #define smp_rmb()	rmb()
 #define smp_wmb()	wmb()
+#define smp_read_barrier_depends()	read_barrier_depends()
 #else
 #define smp_mb()	__asm__ __volatile__("":::"memory");
 #define smp_rmb()	__asm__ __volatile__("":::"memory");
 #define smp_wmb()	__asm__ __volatile__("":::"memory");
+#define smp_read_barrier_depends()	do { } while(0)
 #endif
 
 #define flushi(addr)	__asm__ __volatile__ ("flush %0" : : "r" (addr) : "memory")

kernel/rcupdate.c

@@ -192,7 +192,8 @@ static void rcu_process_callbacks(unsigned long unused)
 void rcu_check_callbacks(int cpu, int user)
 {
 	if (user || 
-	    (idle_cpu(cpu) && !in_softirq() && hardirq_count() <= 1))
+	    (idle_cpu(cpu) && !in_softirq() && 
+				hardirq_count() <= (1 << HARDIRQ_SHIFT)))
 		RCU_qsctr(cpu)++;
 	tasklet_schedule(&RCU_tasklet(cpu));
 }