---

yaml --- r: 82065 b: refs/heads/master c: cbb51af h: refs/heads/master i: 82063: 697cc6f v: v3
git-mirror · Feb 1, 2008 · c49c1e4 · c49c1e4
1 parent fc5842c
commit c49c1e4
Show file tree

Hide file tree

Showing 57 changed files with 1,793 additions and 1,467 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b95d58eaf20eb33c245a2172ec4ecf46bd832309
+refs/heads/master: cbb51afa6d69be003cc827a89e023906885f241e
diff --git a/trunk/Documentation/filesystems/proc.txt b/trunk/Documentation/filesystems/proc.txt
@@ -1134,13 +1134,6 @@ check the amount of free space (value is in seconds). Default settings are: 4,
 resume it  if we have a value of 3 or more percent; consider information about
 the amount of free space valid for 30 seconds
 
-audit_argv_kb
--------------
-
-The file contains a single value denoting the limit on the argv array size
-for execve (in KiB). This limit is only applied when system call auditing for
-execve is enabled, otherwise the value is ignored.
-
 ctrl-alt-del
 ------------
 

diff --git a/trunk/arch/mips/kernel/head.S b/trunk/arch/mips/kernel/head.S
@@ -140,7 +140,7 @@ FEXPORT(__kernel_entry)
 	j	kernel_entry
 #endif
 
-	__INIT_REFOK
+	__REF
 
 NESTED(kernel_entry, 16, sp)			# kernel entry point
 

diff --git a/trunk/arch/mips/mm/Makefile b/trunk/arch/mips/mm/Makefile
@@ -3,7 +3,8 @@
 #
 
 obj-y				+= cache.o dma-default.o extable.o fault.o \
-				   init.o pgtable.o tlbex.o tlbex-fault.o
+				   init.o pgtable.o tlbex.o tlbex-fault.o \
+				   uasm.o
 
 obj-$(CONFIG_32BIT)		+= ioremap.o pgtable-32.o
 obj-$(CONFIG_64BIT)		+= pgtable-64.o
-Original file line number
+Diff line change
@@ Expand Up / @@ -140,7 +140,7 @@ FEXPORT(__kernel_entry) @@
     	j	kernel_entry
     #endif
-    	__INIT_REFOK
+    	__REF
     NESTED(kernel_entry, 16, sp)			# kernel entry point
@@ Expand Down @@