Changeset 3692

Show
Ignore:
Timestamp:
02/07/08 01:35:40 (10 months ago)
Author:
sumsum
Message:

correct syntax in patch files.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/target/linux/brcm-2.6/extra/arch/mips/bcm947xx/time.c

    r3691 r3692  
    5555} 
    5656 
    57 void __init 
    58 plat_timer_setup(struct irqaction *irq) 
    59 { 
    60       /* Enable the timer interrupt */ 
    61       setup_irq(7, irq); 
    62 } 
     57//void __init 
     58//plat_timer_setup(struct irqaction *irq) 
     59//{ 
     60//    /* Enable the timer interrupt */ 
     61//    setup_irq(7, irq); 
     62// } 
    6363 
    6464//TODO: remove this function 

  • trunk/freewrt/target/linux/brcm-2.6/patches/2310-no_highpage.patch

    r3687 r3692  
    3535  * These are used to make use of C type-checking.. 
    3636 
    37 --- a/arch/mips/mm/init.c      2008-02-07 00:24:26.000000000 +0100 
    38 +++ b/arch/mips/mm/init.c      2008-02-07 00:39:26.000000000 +0100 
    39 @@ -205,28 +205,6 @@ 
    40         preempt_check_resched(); 
     37Index: linux-2.6.24/arch/mips/mm/init.c 
     38=================================================================== 
     39--- linux-2.6.24.orig/arch/mips/mm/init.c      2008-02-07 00:24:26.000000000 +0100 
     40+++ linux-2.6.24/arch/mips/mm/init.c      2008-02-07 00:39:26.000000000 +0100 
     41@@ -205,31 +205,6 @@ 
     42         preempt_check_resched(); 
    4143 } 
    42  
     44  
    4345-void copy_user_highpage(struct page *to, struct page *from, 
    44 -       unsigned long vaddr, struct vm_area_struct *vma) 
     46-        unsigned long vaddr, struct vm_area_struct *vma) 
    4547-{ 
    46 -       void *vfrom, *vto; 
     48-        void *vfrom, *vto; 
    4749- 
    48 -       vto = kmap_atomic(to, KM_USER1); 
    49 -       if (cpu_has_dc_aliases && page_mapped(from)) { 
    50 -               vfrom = kmap_coherent(from, vaddr); 
    51 -               copy_page(vto, vfrom); 
    52 -               kunmap_coherent(); 
    53 -       } else { 
    54 -               vfrom = kmap_atomic(from, KM_USER0); 
    55 -               copy_page(vto, vfrom); 
    56 -               kunmap_atomic(vfrom, KM_USER0); 
    57 -       } 
    58 -       if (((vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc) || 
    59 -           pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK)) 
    60 -               flush_data_cache_page((unsigned long)vto); 
    61 -       kunmap_atomic(vto, KM_USER1); 
    62 -       /* Make sure this page is cleared on other CPU's too before using it */ 
    63 -       smp_wmb(); 
     50-        vto = kmap_atomic(to, KM_USER1); 
     51-        if (cpu_has_dc_aliases && page_mapped(from)) { 
     52-                vfrom = kmap_coherent(from, vaddr); 
     53-                copy_page(vto, vfrom); 
     54-                kunmap_coherent(); 
     55-        } else { 
     56-                vfrom = kmap_atomic(from, KM_USER0); 
     57-                copy_page(vto, vfrom); 
     58-                kunmap_atomic(vfrom, KM_USER0); 
     59-        } 
     60-        if (((vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc) || 
     61-            pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK)) 
     62-                flush_data_cache_page((unsigned long)vto); 
     63-        kunmap_atomic(vto, KM_USER1); 
     64-        /* Make sure this page is cleared on other CPU's too before using it */ 
     65-        smp_wmb(); 
    6466-} 
    6567- 
    66 - EXPORT_SYMBOL(copy_user_highpage); 
     68-EXPORT_SYMBOL(copy_user_highpage); 
     69- 
     70 void copy_to_user_page(struct vm_area_struct *vma, 
     71         struct page *page, unsigned long vaddr, void *dst, const void *src, 
     72         unsigned long len) 
    6773