Merge branch 'master' into for-2.6.33

This commit is contained in:
Jens Axboe 2009-12-03 13:49:39 +01:00
commit 220d0b1dbf
966 changed files with 15367 additions and 7219 deletions

View file

@ -28,8 +28,6 @@
#define F_SETOWN 12 /* for sockets. */
#define F_SETSIG 13 /* for sockets. */
#define F_GETSIG 14 /* for sockets. */
#define F_GETOWN_EX 15
#define F_SETOWN_EX 16
/* for posix fcntl() and lockf() */
#define F_RDLCK 01

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[];

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)