Author: cieciwa Date: Wed Sep 14 11:37:46 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- initial
NFY
---- Files affected:
SOURCES:
linux-2.6.13.1-grsec.patch (NONE -> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6.13.1-grsec.patch
diff -u /dev/null SOURCES/linux-2.6.13.1-grsec.patch:1.1.2.1
--- /dev/null Wed Sep 14 13:37:46 2005
+++ SOURCES/linux-2.6.13.1-grsec.patch Wed Sep 14 13:37:41 2005
@@ -0,0 +1,39308 @@
+diff -Nur linux-2.6.13.1.org/Makefile grsecurity226/Makefile
+--- linux-2.6.13.1.org/Makefile 2005-09-10 04:42:58.000000000 +0200
++++ grsecurity226/Makefile 2005-08-30 01:12:29.000000000 +0200
+@@ -562,7 +562,7 @@
+
+
+ ifeq ($(KBUILD_EXTMOD),)
+-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/
++core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ grsecurity/
+
+ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
+ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
+diff -Nur linux-2.6.13.1.org/arch/alpha/kernel/osf_sys.c
grsecurity226/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.13.1.org/arch/alpha/kernel/osf_sys.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/alpha/kernel/osf_sys.c 2005-09-13 23:56:59.000000000
+0200
+@@ -1268,6 +1268,10 @@
+ merely specific addresses, but regions of memory -- perhaps
+ this feature should be incorporated into all ports? */
+
++#ifdef CONFIG_PAX_RANDMMAP
++ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP) || !filp)
++#endif
++
+ if (addr) {
+ addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
+ if (addr != (unsigned long) -ENOMEM)
+@@ -1275,8 +1279,8 @@
+ }
+
+ /* Next, try allocating at TASK_UNMAPPED_BASE. */
+- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
+- len, limit);
++ addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base),
len, limit);
++
+ if (addr != (unsigned long) -ENOMEM)
+ return addr;
+
+diff -Nur linux-2.6.13.1.org/arch/alpha/kernel/ptrace.c
grsecurity226/arch/alpha/kernel/ptrace.c
+--- linux-2.6.13.1.org/arch/alpha/kernel/ptrace.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/alpha/kernel/ptrace.c 2005-08-30 01:12:33.000000000
+0200
+@@ -15,6 +15,7 @@
+ #include <linux/slab.h>
+ #include <linux/security.h>
+ #include <linux/signal.h>
++#include <linux/grsecurity.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+@@ -290,6 +291,9 @@
+ if (!child)
+ goto out_notsk;
+
++ if (gr_handle_ptrace(child, request))
++ goto out;
++
+ if (request == PTRACE_ATTACH) {
+ ret = ptrace_attach(child);
+ goto out;
+diff -Nur linux-2.6.13.1.org/arch/alpha/mm/fault.c
grsecurity226/arch/alpha/mm/fault.c
+--- linux-2.6.13.1.org/arch/alpha/mm/fault.c 2005-09-10 04:42:58.000000000
+0200
++++ grsecurity226/arch/alpha/mm/fault.c 2005-08-30 01:12:35.000000000
+0200
+@@ -25,6 +25,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/interrupt.h>
+ #include <linux/module.h>
++#include <linux/binfmts.h>
+
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+@@ -56,6 +57,125 @@
+ __reload_thread(pcb);
+ }
+
++#ifdef CONFIG_PAX_PAGEEXEC
++/*
++ * PaX: decide what to do with offenders (regs->pc = fault address)
++ *
++ * returns 1 when task should be killed
++ * 2 when patched PLT trampoline was detected
++ * 3 when unpatched PLT trampoline was detected
++ */
++static int pax_handle_fetch_fault(struct pt_regs *regs)
++{
++
++#ifdef CONFIG_PAX_EMUPLT
++ int err;
++
++ do { /* PaX: patched PLT emulation #1 */
++ unsigned int ldah, ldq, jmp;
++
++ err = get_user(ldah, (unsigned int *)regs->pc);
++ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
++ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
++
++ if (err)
++ break;
++
++ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
++ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
++ jmp == 0x6BFB0000U)
++ {
++ unsigned long r27, addr;
++ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) <<
16;
++ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
++
++ addr = regs->r27 + ((addrh ^ 0x80000000UL) +
0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
++ err = get_user(r27, (unsigned long*)addr);
++ if (err)
++ break;
++
++ regs->r27 = r27;
++ regs->pc = r27;
++ return 2;
++ }
++ } while (0);
++
++ do { /* PaX: patched PLT emulation #2 */
++ unsigned int ldah, lda, br;
++
++ err = get_user(ldah, (unsigned int *)regs->pc);
++ err |= get_user(lda, (unsigned int *)(regs->pc+4));
++ err |= get_user(br, (unsigned int *)(regs->pc+8));
++
++ if (err)
++ break;
++
++ if ((ldah & 0xFFFF0000U)== 0x277B0000U &&
++ (lda & 0xFFFF0000U) == 0xA77B0000U &&
++ (br & 0xFFE00000U) == 0xC3E00000U)
++ {
++ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
++ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) <<
16;
++ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
++
++ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) +
((addrl ^ 0x8000UL) + 0x8000UL);
++ regs->pc += 12 + (((addr ^ 0x00100000UL) +
0x00100000UL) << 2);
++ return 2;
++ }
++ } while (0);
++
++ do { /* PaX: unpatched PLT emulation */
++ unsigned int br;
++
++ err = get_user(br, (unsigned int *)regs->pc);
++
++ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
++ unsigned int br2, ldq, nop, jmp;
++ unsigned long addr = br | 0xFFFFFFFFFFE00000UL,
resolver;
++
++ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) +
0x00100000UL) << 2);
++ err = get_user(br2, (unsigned int *)addr);
++ err |= get_user(ldq, (unsigned int *)(addr+4));
++ err |= get_user(nop, (unsigned int *)(addr+8));
++ err |= get_user(jmp, (unsigned int *)(addr+12));
++ err |= get_user(resolver, (unsigned long *)(addr+16));
++
++ if (err)
++ break;
++
++ if (br2 == 0xC3600000U &&
++ ldq == 0xA77B000CU &&
++ nop == 0x47FF041FU &&
++ jmp == 0x6B7B0000U)
++ {
++ regs->r28 = regs->pc+4;
++ regs->r27 = addr+16;
++ regs->pc = resolver;
++ return 3;
++ }
++ }
++ } while (0);
++#endif
++
++ return 1;
++}
++
++void pax_report_insns(void *pc, void *sp)
++{
++ unsigned long i;
++
++ printk(KERN_ERR "PAX: bytes at PC: ");
++ for (i = 0; i < 5; i++) {
++ unsigned int c;
++ if (get_user(c, (unsigned int*)pc+i)) {
++ printk("<invalid address>.");
++ break;
++ }
++ printk("%08x ", c);
++ }
++ printk("\n");
++}
++#endif
+
+ /*
+ * This routine handles page faults. It determines the address,
+@@ -133,8 +253,29 @@
+ good_area:
+ si_code = SEGV_ACCERR;
+ if (cause < 0) {
+- if (!(vma->vm_flags & VM_EXEC))
++ if (!(vma->vm_flags & VM_EXEC)) {
++
++#ifdef CONFIG_PAX_PAGEEXEC
++ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address !=
regs->pc)
++ goto bad_area;
++
++ up_read(&mm->mmap_sem);
++ switch(pax_handle_fetch_fault(regs)) {
++
++#ifdef CONFIG_PAX_EMUPLT
++ case 2:
++ case 3:
++ return;
++#endif
++
++ }
++ pax_report_fault(regs, (void*)regs->pc, (void*)rdusp());
++ do_exit(SIGKILL);
++#else
+ goto bad_area;
++#endif
++
++ }
+ } else if (!cause) {
+ /* Allow reads even for write-only mappings */
+ if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
+diff -Nur linux-2.6.13.1.org/arch/arm/mm/mmap.c
grsecurity226/arch/arm/mm/mmap.c
+--- linux-2.6.13.1.org/arch/arm/mm/mmap.c 2005-09-10 04:42:58.000000000
+0200
++++ grsecurity226/arch/arm/mm/mmap.c 2005-08-30 01:12:38.000000000 +0200
+@@ -62,6 +62,10 @@
+ if (len > TASK_SIZE)
+ return -ENOMEM;
+
++#ifdef CONFIG_PAX_RANDMMAP
++ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || !filp)
++#endif
++
+ if (addr) {
+ if (do_align)
+ addr = COLOUR_ALIGN(addr, pgoff);
+@@ -76,7 +80,7 @@
+ if (len > mm->cached_hole_size) {
+ start_addr = addr = mm->free_area_cache;
+ } else {
+- start_addr = addr = TASK_UNMAPPED_BASE;
++ start_addr = addr = mm->mmap_base;
+ mm->cached_hole_size = 0;
+ }
+
+@@ -93,8 +97,8 @@
+ * Start a new search - just in case we missed
+ * some holes.
+ */
+- if (start_addr != TASK_UNMAPPED_BASE) {
+- start_addr = addr = TASK_UNMAPPED_BASE;
++ if (start_addr != mm->mmap_base) {
++ start_addr = addr = mm->mmap_base;
+ mm->cached_hole_size = 0;
+ goto full_search;
+ }
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/README.mm
grsecurity226/arch/cris/arch-v10/README.mm
+--- linux-2.6.13.1.org/arch/cris/arch-v10/README.mm 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/README.mm 2005-08-30 00:59:40.000000000
+0200
+@@ -3,6 +3,9 @@
+ HISTORY:
+
+ $Log$
+ Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ - initial
+ NFY
+
++Revision 1.1.1.1 2005/08/29 22:59:40 spender
++Initial import of Linux 2.6.13
++
+ Revision 1.1 2001/12/17 13:59:27 bjornw
+ Initial revision
+
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/drivers/axisflashmap.c
grsecurity226/arch/cris/arch-v10/drivers/axisflashmap.c
+--- linux-2.6.13.1.org/arch/cris/arch-v10/drivers/axisflashmap.c
2005-09-10 04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/drivers/axisflashmap.c 2005-08-30
00:59:40.000000000 +0200
+@@ -11,6 +11,9 @@
+ * partition split defined below.
+ *
+ * $Log$
+ * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ * - initial
+ * NFY
+ *
++ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
++ * Initial import of Linux 2.6.13
++ *
+ * Revision 1.11 2004/11/15 10:27:14 starvik
+ * Corrected typo (Thanks to Milton Miller <[EMAIL PROTECTED]>).
+ *
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/drivers/ds1302.c
grsecurity226/arch/cris/arch-v10/drivers/ds1302.c
+--- linux-2.6.13.1.org/arch/cris/arch-v10/drivers/ds1302.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/drivers/ds1302.c 2005-08-30
00:59:40.000000000 +0200
+@@ -7,6 +7,9 @@
+ *! Functions exported: ds1302_readreg, ds1302_writereg, ds1302_init
+ *!
+ *! $Log$
+ *! Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ *! - initial
+ *! NFY
+ *!
++*! Revision 1.1.1.1 2005/08/29 22:59:40 spender
++*! Initial import of Linux 2.6.13
++*!
+ *! Revision 1.18 2005/01/24 09:11:26 mikaelam
+ *! Minor changes to get DS1302 RTC chip driver to work
+ *!
+@@ -135,7 +138,7 @@
+ *!
+ *! (C) Copyright 1999, 2000, 2001, 2002, 2003, 2004 Axis Communications AB,
LUND, SWEDEN
+ *!
+-*! $Id$
++*! $Id$
+ *!
+ *!***************************************************************************/
+
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/drivers/eeprom.c
grsecurity226/arch/cris/arch-v10/drivers/eeprom.c
+--- linux-2.6.13.1.org/arch/cris/arch-v10/drivers/eeprom.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/drivers/eeprom.c 2005-08-30
00:59:40.000000000 +0200
+@@ -20,6 +20,9 @@
+ *! in the spin-lock.
+ *!
+ *! $Log$
+ *! Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ *! - initial
+ *! NFY
+ *!
++*! Revision 1.1.1.1 2005/08/29 22:59:40 spender
++*! Initial import of Linux 2.6.13
++*!
+ *! Revision 1.12 2005/06/19 17:06:46 starvik
+ *! Merge of Linux 2.6.12.
+ *!
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/drivers/gpio.c
grsecurity226/arch/cris/arch-v10/drivers/gpio.c
+--- linux-2.6.13.1.org/arch/cris/arch-v10/drivers/gpio.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/drivers/gpio.c 2005-08-30
00:59:40.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* $Id$
++/* $Id$
+ *
+ * Etrax general port I/O device
+ *
+@@ -9,6 +9,9 @@
+ * Johan Adolfsson (read/set directions, write, port G)
+ *
+ * $Log$
+ * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ * - initial
+ * NFY
+ *
++ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
++ * Initial import of Linux 2.6.13
++ *
+ * Revision 1.17 2005/06/19 17:06:46 starvik
+ * Merge of Linux 2.6.12.
+ *
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/drivers/i2c.c
grsecurity226/arch/cris/arch-v10/drivers/i2c.c
+--- linux-2.6.13.1.org/arch/cris/arch-v10/drivers/i2c.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/drivers/i2c.c 2005-08-30
00:59:40.000000000 +0200
+@@ -12,6 +12,9 @@
+ *! don't use PB_I2C if DS1302 uses same bits,
+ *! use PB.
+ *! $Log$
+ *! Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ *! - initial
+ *! NFY
+ *!
++*! Revision 1.1.1.1 2005/08/29 22:59:40 spender
++*! Initial import of Linux 2.6.13
++*!
+ *! Revision 1.13 2005/03/07 13:13:07 starvik
+ *! Added spinlocks to protect states etc
+ *!
+@@ -84,7 +87,7 @@
+ *! (C) Copyright 1999-2002 Axis Communications AB, LUND, SWEDEN
+ *!
+ *!***************************************************************************/
+-/* $Id$ */
++/* $Id$ */
+
+ /****************** INCLUDE FILES SECTION ***********************************/
+
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/drivers/pcf8563.c
grsecurity226/arch/cris/arch-v10/drivers/pcf8563.c
+--- linux-2.6.13.1.org/arch/cris/arch-v10/drivers/pcf8563.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/drivers/pcf8563.c 2005-08-30
00:59:40.000000000 +0200
+@@ -15,7 +15,7 @@
+ *
+ * Author: Tobias Anderberg <[EMAIL PROTECTED]>.
+ *
+- * $Id$
++ * $Id$
+ */
+
+ #include <linux/config.h>
+@@ -40,7 +40,7 @@
+ #define PCF8563_MAJOR 121 /* Local major number. */
+ #define DEVICE_NAME "rtc" /* Name which is registered in
/proc/devices. */
+ #define PCF8563_NAME "PCF8563"
+-#define DRIVER_VERSION "$Revision$"
++#define DRIVER_VERSION "$Revision$"
+
+ /* I2C bus slave registers. */
+ #define RTC_I2C_READ 0xa3
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/kernel/debugport.c
grsecurity226/arch/cris/arch-v10/kernel/debugport.c
+--- linux-2.6.13.1.org/arch/cris/arch-v10/kernel/debugport.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/kernel/debugport.c 2005-08-30
00:59:40.000000000 +0200
+@@ -12,6 +12,9 @@
+ * init_etrax_debug()
+ *
+ * $Log$
+ * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ * - initial
+ * NFY
+ *
++ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
++ * Initial import of Linux 2.6.13
++ *
+ * Revision 1.27 2005/06/10 10:34:14 starvik
+ * Real console support
+ *
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/kernel/entry.S
grsecurity226/arch/cris/arch-v10/kernel/entry.S
+--- linux-2.6.13.1.org/arch/cris/arch-v10/kernel/entry.S 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/kernel/entry.S 2005-08-30
00:59:40.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* $Id$
++/* $Id$
+ *
+ * linux/arch/cris/entry.S
+ *
+@@ -7,6 +7,9 @@
+ * Authors: Bjorn Wesen ([EMAIL PROTECTED])
+ *
+ * $Log$
+ * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ * - initial
+ * NFY
+ *
++ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
++ * Initial import of Linux 2.6.13
++ *
+ * Revision 1.28 2005/06/20 05:06:30 starvik
+ * Remove unnecessary diff to kernel.org tree
+ *
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/kernel/fasttimer.c
grsecurity226/arch/cris/arch-v10/kernel/fasttimer.c
+--- linux-2.6.13.1.org/arch/cris/arch-v10/kernel/fasttimer.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/kernel/fasttimer.c 2005-08-30
00:59:40.000000000 +0200
+@@ -1,10 +1,13 @@
+-/* $Id$
++/* $Id$
+ * linux/arch/cris/kernel/fasttimer.c
+ *
+ * Fast timers for ETRAX100/ETRAX100LX
+ * This may be useful in other OS than Linux so use 2 space indentation...
+ *
+ * $Log$
+ * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ * - initial
+ * NFY
+ *
++ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
++ * Initial import of Linux 2.6.13
++ *
+ * Revision 1.9 2005/03/04 08:16:16 starvik
+ * Merge of Linux 2.6.11.
+ *
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/kernel/head.S
grsecurity226/arch/cris/arch-v10/kernel/head.S
+--- linux-2.6.13.1.org/arch/cris/arch-v10/kernel/head.S 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/kernel/head.S 2005-08-30
00:59:40.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* $Id$
++/* $Id$
+ *
+ * Head of the kernel - alter with care
+ *
+@@ -7,6 +7,9 @@
+ * Authors: Bjorn Wesen ([EMAIL PROTECTED])
+ *
+ * $Log$
+ * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ * - initial
+ * NFY
+ *
++ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
++ * Initial import of Linux 2.6.13
++ *
+ * Revision 1.10 2005/06/20 05:12:54 starvik
+ * Remove unnecessary diff to kernel.org tree
+ *
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/kernel/kgdb.c
grsecurity226/arch/cris/arch-v10/kernel/kgdb.c
+--- linux-2.6.13.1.org/arch/cris/arch-v10/kernel/kgdb.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/kernel/kgdb.c 2005-08-30
00:59:40.000000000 +0200
+@@ -18,6 +18,9 @@
+ *! Jul 21 1999 Bjorn Wesen eLinux port
+ *!
+ *! $Log$
+ *! Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ *! - initial
+ *! NFY
+ *!
++*! Revision 1.1.1.1 2005/08/29 22:59:40 spender
++*! Initial import of Linux 2.6.13
++*!
+ *! Revision 1.6 2005/01/14 10:12:17 starvik
+ *! KGDB on separate port.
+ *! Console fixes from 2.4.
+@@ -75,7 +78,7 @@
+ *!
+ *!---------------------------------------------------------------------------
+ *!
+-*! $Id$
++*! $Id$
+ *!
+ *! (C) Copyright 1999, Axis Communications AB, LUND, SWEDEN
+ *!
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v10/lib/dram_init.S
grsecurity226/arch/cris/arch-v10/lib/dram_init.S
+--- linux-2.6.13.1.org/arch/cris/arch-v10/lib/dram_init.S 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v10/lib/dram_init.S 2005-08-30
00:59:40.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* $Id$
++/* $Id$
+ *
+ * DRAM/SDRAM initialization - alter with care
+ * This file is intended to be included from other assembler files
+@@ -11,6 +11,9 @@
+ * Authors: Mikael Starvik ([EMAIL PROTECTED])
+ *
+ * $Log$
+ * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ * - initial
+ * NFY
+ *
++ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
++ * Initial import of Linux 2.6.13
++ *
+ * Revision 1.4 2003/09/22 09:21:59 starvik
+ * Decompresser is linked to 0x407xxxxx and sdram commands are at 0x000xxxxx
+ * so we need to mask off 12 bits.
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v32/drivers/gpio.c
grsecurity226/arch/cris/arch-v32/drivers/gpio.c
+--- linux-2.6.13.1.org/arch/cris/arch-v32/drivers/gpio.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v32/drivers/gpio.c 2005-08-30
00:59:40.000000000 +0200
+@@ -1,4 +1,4 @@
+-/* $Id$
++/* $Id$
+ *
+ * ETRAX CRISv32 general port I/O device
+ *
+@@ -10,6 +10,9 @@
+ * port to ETRAX FS.
+ *
+ * $Log$
+ * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ * - initial
+ * NFY
+ *
++ * Revision 1.1.1.1 2005/08/29 22:59:40 spender
++ * Initial import of Linux 2.6.13
++ *
+ * Revision 1.16 2005/06/19 17:06:49 starvik
+ * Merge of Linux 2.6.12.
+ *
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v32/drivers/pcf8563.c
grsecurity226/arch/cris/arch-v32/drivers/pcf8563.c
+--- linux-2.6.13.1.org/arch/cris/arch-v32/drivers/pcf8563.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v32/drivers/pcf8563.c 2005-08-30
00:59:40.000000000 +0200
+@@ -39,7 +39,7 @@
+ #define PCF8563_MAJOR 121 /* Local major number. */
+ #define DEVICE_NAME "rtc" /* Name which is registered in /proc/devices. */
+ #define PCF8563_NAME "PCF8563"
+-#define DRIVER_VERSION "$Revision$"
++#define DRIVER_VERSION "$Revision$"
+
+ /* Two simple wrapper macros, saves a few keystrokes. */
+ #define rtc_read(x) i2c_readreg(RTC_I2C_READ, x)
+diff -Nur linux-2.6.13.1.org/arch/cris/arch-v32/kernel/fasttimer.c
grsecurity226/arch/cris/arch-v32/kernel/fasttimer.c
+--- linux-2.6.13.1.org/arch/cris/arch-v32/kernel/fasttimer.c 2005-09-10
04:42:58.000000000 +0200
++++ grsecurity226/arch/cris/arch-v32/kernel/fasttimer.c 2005-08-30
00:59:40.000000000 +0200
+@@ -1,10 +1,13 @@
+-/* $Id$
++/* $Id$
+ * linux/arch/cris/kernel/fasttimer.c
+ *
+ * Fast timers for ETRAX FS
+ * This may be useful in other OS than Linux so use 2 space indentation...
+ *
+ * $Log$
+ * Revision 1.1.2.1 2005/09/14 11:37:41 cieciwa
+ * - initial
+ * NFY
<<Diff was trimmed, longer than 597 lines>>
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
