Merge /spare/repo/linux-2.6/

5 files changed, 7 insertions, 67 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index aca028aa29bf..aba05394d30a 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -211,6 +211,10 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        default y
+
 config SUN_PM
         bool
         default y
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 597d3ff6ad68..36a40697b8d6 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -840,10 +840,7 @@ static int pci_do_settimeofday(struct timespec *tv)
 
         xtime.tv_sec = tv->tv_sec;
         xtime.tv_nsec = tv->tv_nsec;
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         return 0;
 }
 
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c
index 8faa8dc4de43..5d974a2b735a 100644
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
@@ -175,7 +175,6 @@ EXPORT_SYMBOL(set_auxio);
 EXPORT_SYMBOL(get_auxio);
 #endif
 EXPORT_SYMBOL(request_fast_irq);
-EXPORT_SYMBOL(io_remap_page_range);
 EXPORT_SYMBOL(io_remap_pfn_range);
   /* P3: iounit_xxx may be needed, sun4d users */
 /* EXPORT_SYMBOL(iounit_map_dma_init); */
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 3b759aefc170..bc015e980341 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -139,7 +139,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 
 
         /* Determine when to update the Mostek clock. */
-        if ((time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
             (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
@@ -554,10 +554,7 @@ static int sbus_do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         return 0;
 }
 
diff --git a/arch/sparc/mm/generic.c b/arch/sparc/mm/generic.c
index db27eee3bda1..20ccb957fb77 100644
--- a/arch/sparc/mm/generic.c
+++ b/arch/sparc/mm/generic.c
@@ -16,31 +16,6 @@
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 
-static inline void forget_pte(pte_t page)
-{
-#if 0 /* old 2.4 code */
-        if (pte_none(page))
-                return;
-        if (pte_present(page)) {
-                unsigned long pfn = pte_pfn(page);
-                struct page *ptpage;
-                if (!pfn_valid(pfn))
-                        return;
-                ptpage = pfn_to_page(pfn);
-                if (PageReserved(ptpage))
-                        return;
-                page_cache_release(ptpage);
-                return;
-        }
-        swap_free(pte_to_swp_entry(page));
-#else
-        if (!pte_none(page)) {
-                printk("forget_pte: old mapping existed!\n");
-                BUG();
-        }
-#endif
-}
-
 /* Remap IO memory, the same way as remap_pfn_range(), but use
  * the obio memory space.
  *
@@ -60,7 +35,6 @@ static inline void io_remap_pte_range(struct mm_struct *mm, pte_t * pte, unsigne
                 pte_t oldpage = *pte;
                 pte_clear(mm, address, pte);
                 set_pte(pte, mk_pte_io(offset, prot, space));
-                forget_pte(oldpage);
                 address += PAGE_SIZE;
                 offset += PAGE_SIZE;
                 pte++;
@@ -88,37 +62,6 @@ static inline int io_remap_pmd_range(struct mm_struct *mm, pmd_t * pmd, unsigned
         return 0;
 }
 
-int io_remap_page_range(struct vm_area_struct *vma, unsigned long from, unsigned long offset, unsigned long size, pgprot_t prot, int space)
-{
-        int error = 0;
-        pgd_t * dir;
-        unsigned long beg = from;
-        unsigned long end = from + size;
-        struct mm_struct *mm = vma->vm_mm;
-
-        prot = __pgprot(pg_iobits);
-        offset -= from;
-        dir = pgd_offset(mm, from);
-        flush_cache_range(vma, beg, end);
-
-        spin_lock(&mm->page_table_lock);
-        while (from < end) {
-                pmd_t *pmd = pmd_alloc(current->mm, dir, from);
-                error = -ENOMEM;
-                if (!pmd)
-                        break;
-                error = io_remap_pmd_range(mm, pmd, from, end - from, offset + from, prot, space);
-                if (error)
-                        break;
-                from = (from + PGDIR_SIZE) & PGDIR_MASK;
-                dir++;
-        }
-        spin_unlock(&mm->page_table_lock);
-
-        flush_tlb_range(vma, beg, end);
-        return error;
-}
-
 int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
                         unsigned long pfn, unsigned long size, pgprot_t prot)
 {