---

yaml --- r: 65244 b: refs/heads/master c: e80eaf9 h: refs/heads/master v: v3
git-mirror · Oct 2, 2007 · fd88318 · fd88318
1 parent 2d5eefb
commit fd88318
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e48395f1753cab0fde6c03f1db833cece9ef2ba0
+refs/heads/master: e80eaf9904d5b19512265e1435372b2e12146a5f
diff --git a/trunk/Makefile b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 23
-EXTRAVERSION =-rc8
+EXTRAVERSION =-rc9
 NAME = Arr Matey! A Hairy Bilge Rat!
 
 # *DOCUMENTATION*

diff --git a/trunk/arch/mips/kernel/vmlinux.lds.S b/trunk/arch/mips/kernel/vmlinux.lds.S
@@ -45,6 +45,8 @@ SECTIONS
   __dbe_table : { *(__dbe_table) }
   __stop___dbe_table = .;
 
+  NOTES
+
   RODATA
 
   /* writeable */

diff --git a/trunk/arch/x86_64/vdso/voffset.h b/trunk/arch/x86_64/vdso/voffset.h
@@ -1 +1 @@
-#define VDSO_TEXT_OFFSET 0x500
+#define VDSO_TEXT_OFFSET 0x600
diff --git a/trunk/include/asm-mips/fcntl.h b/trunk/include/asm-mips/fcntl.h
@@ -13,6 +13,7 @@
 #define O_SYNC		0x0010
 #define O_NONBLOCK	0x0080
 #define O_CREAT         0x0100	/* not fcntl */
+#define O_TRUNC		0x0200	/* not fcntl */
 #define O_EXCL		0x0400	/* not fcntl */
 #define O_NOCTTY	0x0800	/* not fcntl */
 #define FASYNC		0x1000	/* fcntl, for BSD compatibility */
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,6 +45,8 @@ SECTIONS @@
       __dbe_table : { *(__dbe_table) }
       __stop___dbe_table = .;
+      NOTES
       RODATA
       /* writeable */
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define VDSO_TEXT_OFFSET 0x500
		#define VDSO_TEXT_OFFSET 0x600