A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source 
Conflicts:
	net/mac80211/ht.c
This commit is contained in:
David S. Miller 2009-12-01 22:13:38 -08:00
commit ff9c38bba3
233 changed files with 4034 additions and 928 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/parisc/kernel/unwind.c
View file

@ -28,7 +28,7 @@
#define dbg(x...)
#endif
#define KERNEL_START (KERNEL_BINARY_TEXT_START - 0x1000)
#define KERNEL_START (KERNEL_BINARY_TEXT_START)
extern struct unwind_table_entry __start___unwind[];
extern struct unwind_table_entry __stop___unwind[];

6
arch/parisc/kernel/vmlinux.lds.S
View file

@ -78,9 +78,6 @@ SECTIONS
*/
. = ALIGN(PAGE_SIZE);
data_start = .;
EXCEPTION_TABLE(16)
NOTES
/* unwind info */
.PARISC.unwind : {
@ -89,6 +86,9 @@ SECTIONS
__stop___unwind = .;
}
EXCEPTION_TABLE(16)
NOTES
/* Data */
RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)