lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.35-rc3' into perf/core

Browse Source 
Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
This commit is contained in:
Ingo Molnar
2010-06-18 10:53:12 +02:00
parent 0f2c3de2ba 7e27d6e778
commit 646b1db495
1019 changed files with 83316 additions and 7749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/boot/btfixupprep.c
View File

@@ -325,7 +325,7 @@ main1:
(*rr)->next = NULL;
}
printf("! Generated by btfixupprep. Do not edit.\n\n");
printf("\t.section\t\".data.init\",#alloc,#write\n\t.align\t4\n\n");
printf("\t.section\t\".data..init\",#alloc,#write\n\t.align\t4\n\n");
printf("\t.global\t___btfixup_start\n___btfixup_start:\n\n");
for (i = 0; i < last; i++) {
f = array + i;

2
arch/sparc/include/asm/cache.h
View File

@@ -21,7 +21,7 @@
#define SMP_CACHE_BYTES (1 << SMP_CACHE_BYTES_SHIFT)
#define __read_mostly __attribute__((__section__(".data.read_mostly")))
#define __read_mostly __attribute__((__section__(".data..read_mostly")))
#ifdef CONFIG_SPARC32
#include <asm/asi.h>