2 files changed, 7 insertions, 5 deletions

diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c
index 0aa35f0eb0db..deb67843693c 100644
--- a/arch/frv/mb93090-mb00/pci-vdk.c
+++ b/arch/frv/mb93090-mb00/pci-vdk.c
@@ -320,7 +320,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
  *  are examined.
  */
 
-void __init pcibios_fixup_bus(struct pci_bus *bus)
+void pcibios_fixup_bus(struct pci_bus *bus)
 {
 #if 0
         printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number);
diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c
index 331c1e2cfb67..9a66372fc7c7 100644
--- a/arch/frv/mm/fault.c
+++ b/arch/frv/mm/fault.c
@@ -34,11 +34,11 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
         struct vm_area_struct *vma;
         struct mm_struct *mm;
         unsigned long _pme, lrai, lrad, fixup;
+        unsigned long flags = 0;
         siginfo_t info;
         pgd_t *pge;
         pud_t *pue;
         pte_t *pte;
-        int write;
         int fault;
 
 #if 0
@@ -81,6 +81,9 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
         if (in_atomic() || !mm)
                 goto no_context;
 
+        if (user_mode(__frame))
+                flags |= FAULT_FLAG_USER;
+
         down_read(&mm->mmap_sem);
 
         vma = find_vma(mm, ear0);
@@ -129,7 +132,6 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
  */
  good_area:
         info.si_code = SEGV_ACCERR;
-        write = 0;
         switch (esr0 & ESR0_ATXC) {
         default:
                 /* handle write to write protected page */
@@ -140,7 +142,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
 #endif
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
-                write = 1;
+                flags |= FAULT_FLAG_WRITE;
                 break;
 
                  /* handle read from protected page */
@@ -162,7 +164,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
          * make sure we exit gracefully rather than endlessly redo
          * the fault.
          */
-        fault = handle_mm_fault(mm, vma, ear0, write ? FAULT_FLAG_WRITE : 0);
+        fault = handle_mm_fault(mm, vma, ear0, flags);
         if (unlikely(fault & VM_FAULT_ERROR)) {
                 if (fault & VM_FAULT_OOM)
                         goto out_of_memory;