aboutsummaryrefslogtreecommitdiff
path: root/arch/cris/mm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/cris/mm')
-rw-r--r--arch/cris/mm/fault.c169
-rw-r--r--arch/cris/mm/init.c111
2 files changed, 28 insertions, 252 deletions
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 3034f3ff950..c4c76db90f9 100644
--- a/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@ -1,130 +1,9 @@
/*
* linux/arch/cris/mm/fault.c
*
- * Copyright (C) 2000, 2001 Axis Communications AB
- *
- * Authors: Bjorn Wesen
- *
- * $Log: fault.c,v $
- * Revision 1.20 2005/03/04 08:16:18 starvik
- * Merge of Linux 2.6.11.
- *
- * Revision 1.19 2005/01/14 10:07:59 starvik
- * Fixed warning.
- *
- * Revision 1.18 2005/01/12 08:10:14 starvik
- * Re-added the change of frametype when handling kernel page fault fixup
- * for v10. This is necessary to avoid that the CPU remakes the faulting
- * access.
- *
- * Revision 1.17 2005/01/11 13:53:05 starvik
- * Use raw_printk.
- *
- * Revision 1.16 2004/12/17 11:39:41 starvik
- * SMP support.
- *
- * Revision 1.15 2004/11/23 18:36:18 starvik
- * Stack is now non-executable.
- * Signal handler trampolines are placed in a reserved page mapped into all
- * processes.
- *
- * Revision 1.14 2004/11/23 07:10:21 starvik
- * Moved find_fixup_code to generic code.
- *
- * Revision 1.13 2004/11/23 07:00:54 starvik
- * Actually use the execute permission bit in the MMU. This makes it possible
- * to prevent e.g. attacks where executable code is put on the stack.
- *
- * Revision 1.12 2004/09/29 06:16:04 starvik
- * Use instruction_pointer
- *
- * Revision 1.11 2004/05/14 07:58:05 starvik
- * Merge of changes from 2.4
- *
- * Revision 1.10 2003/10/27 14:51:24 starvik
- * Removed debugcode
- *
- * Revision 1.9 2003/10/27 14:50:42 starvik
- * Changed do_page_fault signature
- *
- * Revision 1.8 2003/07/04 13:02:48 tobiasa
- * Moved code snippet from arch/cris/mm/fault.c that searches for fixup code
- * to separate function in arch-specific files.
- *
- * Revision 1.7 2003/01/22 06:48:38 starvik
- * Fixed warnings issued by GCC 3.2.1
- *
- * Revision 1.6 2003/01/09 14:42:52 starvik
- * Merge of Linux 2.5.55
- *
- * Revision 1.5 2002/12/11 14:44:48 starvik
- * Extracted v10 (ETRAX 100LX) specific stuff to arch/cris/arch-v10/mm
- *
- * Revision 1.4 2002/11/13 15:10:28 starvik
- * pte_offset has been renamed to pte_offset_kernel
- *
- * Revision 1.3 2002/11/05 06:45:13 starvik
- * Merge of Linux 2.5.45
- *
- * Revision 1.2 2001/12/18 13:35:22 bjornw
- * Applied the 2.4.13->2.4.16 CRIS patch to 2.5.1 (is a copy of 2.4.15).
- *
- * Revision 1.20 2001/11/22 13:34:06 bjornw
- * * Bug workaround (LX TR89): force a rerun of the whole of an interrupted
- * unaligned write, because the second half of the write will be corrupted
- * otherwise. Affected unaligned writes spanning not-yet mapped pages.
- * * Optimization: use the wr_rd bit in R_MMU_CAUSE to know whether a miss
- * was due to a read or a write (before we didn't know this until the next
- * restart of the interrupted instruction, thus wasting one fault-irq)
- *
- * Revision 1.19 2001/11/12 19:02:10 pkj
- * Fixed compiler warnings.
- *
- * Revision 1.18 2001/07/18 22:14:32 bjornw
- * Enable interrupts in the bulk of do_page_fault
- *
- * Revision 1.17 2001/07/18 13:07:23 bjornw
- * * Detect non-existant PTE's in vmalloc pmd synchronization
- * * Remove comment about fast-paths for VMALLOC_START etc, because all that
- * was totally bogus anyway it turned out :)
- * * Fix detection of vmalloc-area synchronization
- * * Add some comments
- *
- * Revision 1.16 2001/06/13 00:06:08 bjornw
- * current_pgd should be volatile
- *
- * Revision 1.15 2001/06/13 00:02:23 bjornw
- * Use a separate variable to store the current pgd to avoid races in schedule
- *
- * Revision 1.14 2001/05/16 17:41:07 hp
- * Last comment tweak further tweaked.
- *
- * Revision 1.13 2001/05/15 00:58:44 hp
- * Expand a bit on the comment why we compare address >= TASK_SIZE rather
- * than >= VMALLOC_START.
- *
- * Revision 1.12 2001/04/04 10:51:14 bjornw
- * mmap_sem is grabbed for reading
- *
- * Revision 1.11 2001/03/23 07:36:07 starvik
- * Corrected according to review remarks
- *
- * Revision 1.10 2001/03/21 16:10:11 bjornw
- * CRIS_FRAME_FIXUP not needed anymore, use FRAME_NORMAL
- *
- * Revision 1.9 2001/03/05 13:22:20 bjornw
- * Spell-fix and fix in vmalloc_fault handling
- *
- * Revision 1.8 2000/11/22 14:45:31 bjornw
- * * 2.4.0-test10 removed the set_pgdir instantaneous kernel global mapping
- * into all processes. Instead we fill in the missing PTE entries on demand.
- *
- * Revision 1.7 2000/11/21 16:39:09 bjornw
- * fixup switches frametype
- *
- * Revision 1.6 2000/11/17 16:54:08 bjornw
- * More detailed siginfo reporting
+ * Copyright (C) 2000-2006 Axis Communications AB
*
+ * Authors: Bjorn Wesen
*
*/
@@ -135,7 +14,6 @@
extern int find_fixup_code(struct pt_regs *);
extern void die_if_kernel(const char *, struct pt_regs *, long);
-extern int raw_printk(const char *fmt, ...);
/* debug of low-level TLB reload */
#undef DEBUG
@@ -164,8 +42,8 @@ unsigned long cris_signal_return_page;
* address.
*
* error_code:
- * bit 0 == 0 means no page found, 1 means protection fault
- * bit 1 == 0 means read, 1 means write
+ * bit 0 == 0 means no page found, 1 means protection fault
+ * bit 1 == 0 means read, 1 means write
*
* If this routine detects a bad access, it returns 1, otherwise it
* returns 0.
@@ -181,9 +59,10 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
siginfo_t info;
int fault;
- D(printk("Page fault for %lX on %X at %lX, prot %d write %d\n",
- address, smp_processor_id(), instruction_pointer(regs),
- protection, writeaccess));
+ D(printk(KERN_DEBUG
+ "Page fault for %lX on %X at %lX, prot %d write %d\n",
+ address, smp_processor_id(), instruction_pointer(regs),
+ protection, writeaccess));
tsk = current;
@@ -233,7 +112,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
* context, we must not take the fault..
*/
- if (in_atomic() || !mm)
+ if (in_interrupt() || !mm)
goto no_context;
down_read(&mm->mmap_sem);
@@ -319,6 +198,9 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
/* info.si_code has been set above */
info.si_addr = (void *)address;
force_sig_info(SIGSEGV, &info, tsk);
+ printk(KERN_NOTICE "%s (pid %d) segfaults for page "
+ "address %08lx at pc %08lx\n",
+ tsk->comm, tsk->pid, address, instruction_pointer(regs));
return;
}
@@ -326,7 +208,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
/* Are we prepared to handle this kernel fault?
*
- * (The kernel has valid exception-points in the source
+ * (The kernel has valid exception-points in the source
* when it acesses user-memory. When it fails in one
* of those points, we find it in a table and do a jump
* to some fixup code that loads an appropriate error
@@ -341,13 +223,18 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
* terminate things with extreme prejudice.
*/
- if ((unsigned long) (address) < PAGE_SIZE)
- raw_printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");
- else
- raw_printk(KERN_ALERT "Unable to handle kernel access");
- raw_printk(" at virtual address %08lx\n",address);
-
- die_if_kernel("Oops", regs, (writeaccess << 1) | protection);
+ if (!oops_in_progress) {
+ oops_in_progress = 1;
+ if ((unsigned long) (address) < PAGE_SIZE)
+ printk(KERN_ALERT "Unable to handle kernel NULL "
+ "pointer dereference");
+ else
+ printk(KERN_ALERT "Unable to handle kernel access"
+ " at virtual address %08lx\n", address);
+
+ die_if_kernel("Oops", regs, (writeaccess << 1) | protection);
+ oops_in_progress = 0;
+ }
do_exit(SIGKILL);
@@ -360,7 +247,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
up_read(&mm->mmap_sem);
printk("VM: killing process %s\n", tsk->comm);
if (user_mode(regs))
- do_group_exit(SIGKILL);
+ do_exit(SIGKILL);
goto no_context;
do_sigbus:
@@ -406,8 +293,8 @@ vmalloc_fault:
/* Since we're two-level, we don't need to do both
* set_pgd and set_pmd (they do the same thing). If
* we go three-level at some point, do the right thing
- * with pgd_present and set_pgd here.
- *
+ * with pgd_present and set_pgd here.
+ *
* Also, since the vmalloc area is global, we don't
* need to copy individual PTE's, it is enough to
* copy the pgd pointer into the pte page of the
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c
index 0c833d17622..4207a2b5275 100644
--- a/arch/cris/mm/init.c
+++ b/arch/cris/mm/init.c
@@ -6,117 +6,6 @@
*
* Authors: Bjorn Wesen (bjornw@axis.com)
*
- * $Log: init.c,v $
- * Revision 1.11 2004/05/28 09:28:56 starvik
- * Calculation of loops_per_usec moved because initialization order has changed
- * in Linux 2.6.
- *
- * Revision 1.10 2004/05/14 07:58:05 starvik
- * Merge of changes from 2.4
- *
- * Revision 1.9 2003/07/04 08:27:54 starvik
- * Merge of Linux 2.5.74
- *
- * Revision 1.8 2003/04/09 05:20:48 starvik
- * Merge of Linux 2.5.67
- *
- * Revision 1.7 2003/01/22 06:48:38 starvik
- * Fixed warnings issued by GCC 3.2.1
- *
- * Revision 1.6 2002/12/11 14:44:48 starvik
- * Extracted v10 (ETRAX 100LX) specific stuff to arch/cris/arch-v10/mm
- *
- * Revision 1.5 2002/11/18 07:37:37 starvik
- * Added cache bug workaround (from Linux 2.4)
- *
- * Revision 1.4 2002/11/13 15:40:24 starvik
- * Removed the page table cache stuff (as done in other archs)
- *
- * Revision 1.3 2002/11/05 06:45:13 starvik
- * Merge of Linux 2.5.45
- *
- * Revision 1.2 2001/12/18 13:35:22 bjornw
- * Applied the 2.4.13->2.4.16 CRIS patch to 2.5.1 (is a copy of 2.4.15).
- *
- * Revision 1.31 2001/11/13 16:22:00 bjornw
- * Skip calculating totalram and sharedram in si_meminfo
- *
- * Revision 1.30 2001/11/12 19:02:10 pkj
- * Fixed compiler warnings.
- *
- * Revision 1.29 2001/07/25 16:09:50 bjornw
- * val->sharedram will stay 0
- *
- * Revision 1.28 2001/06/28 16:30:17 bjornw
- * Oops. This needs to wait until 2.4.6 is merged
- *
- * Revision 1.27 2001/06/28 14:04:07 bjornw
- * Fill in sharedram
- *
- * Revision 1.26 2001/06/18 06:36:02 hp
- * Enable free_initmem of __init-type pages
- *
- * Revision 1.25 2001/06/13 00:02:23 bjornw
- * Use a separate variable to store the current pgd to avoid races in schedule
- *
- * Revision 1.24 2001/05/15 00:52:20 hp
- * Only map segment 0xa as seg if CONFIG_JULIETTE
- *
- * Revision 1.23 2001/04/04 14:35:40 bjornw
- * * Removed get_pte_slow and friends (2.4.3 change)
- * * Removed bad_pmd handling (2.4.3 change)
- *
- * Revision 1.22 2001/04/04 13:38:04 matsfg
- * Moved ioremap to a separate function instead
- *
- * Revision 1.21 2001/03/27 09:28:33 bjornw
- * ioremap used too early - lets try it in mem_init instead
- *
- * Revision 1.20 2001/03/23 07:39:21 starvik
- * Corrected according to review remarks
- *
- * Revision 1.19 2001/03/15 14:25:17 bjornw
- * More general shadow registers and ioremaped addresses for external I/O
- *
- * Revision 1.18 2001/02/23 12:46:44 bjornw
- * * 0xc was not CSE1; 0x8 is, same as uncached flash, so we move the uncached
- * flash during CRIS_LOW_MAP from 0xe to 0x8 so both the flash and the I/O
- * is mapped straight over (for !CRIS_LOW_MAP the uncached flash is still 0xe)
- *
- * Revision 1.17 2001/02/22 15:05:21 bjornw
- * Map 0x9 straight over during LOW_MAP to allow for memory mapped LEDs
- *
- * Revision 1.16 2001/02/22 15:02:35 bjornw
- * Map 0xc straight over during LOW_MAP to allow for memory mapped I/O
- *
- * Revision 1.15 2001/01/10 21:12:10 bjornw
- * loops_per_sec -> loops_per_jiffy
- *
- * Revision 1.14 2000/11/22 16:23:20 bjornw
- * Initialize totalhigh counters to 0 to make /proc/meminfo look nice.
- *
- * Revision 1.13 2000/11/21 16:37:51 bjornw
- * Temporarily disable initmem freeing
- *
- * Revision 1.12 2000/11/21 13:55:07 bjornw
- * Use CONFIG_CRIS_LOW_MAP for the low VM map instead of explicit CPU type
- *
- * Revision 1.11 2000/10/06 12:38:22 bjornw
- * Cast empty_bad_page correctly (should really be of * type from the start..
- *
- * Revision 1.10 2000/10/04 16:53:57 bjornw
- * Fix memory-map due to LX features
- *
- * Revision 1.9 2000/09/13 15:47:49 bjornw
- * Wrong count in reserved-pages loop
- *
- * Revision 1.8 2000/09/13 14:35:10 bjornw
- * 2.4.0-test8 added a new arg to free_area_init_node
- *
- * Revision 1.7 2000/08/17 15:35:55 bjornw
- * 2.4.0-test6 removed MAP_NR and inserted virt_to_page
- *
- *
*/
#include <linux/init.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 18:13:38 +0000