diff options
| author | Len Brown <len.brown@intel.com> | 2004-08-12 03:56:29 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-08-12 03:56:29 -0400 |
| commit | 2adcd7e4d4b9c59d4dc35adcc1cb785601aafb0a (patch) | |
| tree | e45dfd4903b1c49536480042c00c8d5a33696488 /arch | |
| parent | 0401cc9d000100f43b10a10da7176b03c129b2a4 (diff) | |
| parent | da58de4bc4757780df70c71195ced7f4611102ca (diff) | |
| download | history-2adcd7e4d4b9c59d4dc35adcc1cb785601aafb0a.tar.gz | |
Merge intel.com:/home/lenb/bk/linux-2.6.8
into intel.com:/home/lenb/src/linux-acpi-test-2.6.8
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/configs/ebony_defconfig | 2 | ||||
| -rw-r--r-- | arch/ppc/configs/ocotea_defconfig | 2 | ||||
| -rw-r--r-- | arch/sparc64/defconfig | 3 | ||||
| -rw-r--r-- | arch/sparc64/lib/copy_page.S | 4 | ||||
| -rw-r--r-- | arch/sparc64/mm/fault.c | 4 | ||||
| -rw-r--r-- | arch/sparc64/mm/tlb.c | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/arch/ppc/configs/ebony_defconfig b/arch/ppc/configs/ebony_defconfig index 6b28145ded2b90..c8deca3b454507 100644 --- a/arch/ppc/configs/ebony_defconfig +++ b/arch/ppc/configs/ebony_defconfig @@ -384,7 +384,7 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y +# CONFIG_SERIAL_8250_MANY_PORTS is not set CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set # CONFIG_SERIAL_8250_MULTIPORT is not set diff --git a/arch/ppc/configs/ocotea_defconfig b/arch/ppc/configs/ocotea_defconfig index 4d14e58ebe9621..9dcf575c706f89 100644 --- a/arch/ppc/configs/ocotea_defconfig +++ b/arch/ppc/configs/ocotea_defconfig @@ -398,7 +398,7 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y +# CONFIG_SERIAL_8250_MANY_PORTS is not set CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set # CONFIG_SERIAL_8250_MULTIPORT is not set diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index cb10e3819b3140..7fa2d47a622986 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -1204,6 +1204,8 @@ CONFIG_UDF_NLS=y CONFIG_FAT_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set # @@ -1768,6 +1770,7 @@ CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=m diff --git a/arch/sparc64/lib/copy_page.S b/arch/sparc64/lib/copy_page.S index c7111e044b5a71..862eefb17f72d3 100644 --- a/arch/sparc64/lib/copy_page.S +++ b/arch/sparc64/lib/copy_page.S @@ -168,9 +168,9 @@ copy_user_page: /* %o0=dest, %o1=src, %o2=vaddr */ 9: VISEntry - ldx [%g6 + TI_FLAGS], %g3 + ldub [%g6 + TI_FAULT_CODE], %g3 mov %o0, %g1 - andcc %g3, _TIF_BLKCOMMIT, %g0 + cmp %g3, 0 rd %asi, %g3 be,a,pt %icc, 1f wr %g0, ASI_BLK_P, %asi diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c index 640c46ede0790e..49c3dd29a5b69e 100644 --- a/arch/sparc64/mm/fault.c +++ b/arch/sparc64/mm/fault.c @@ -428,7 +428,8 @@ good_area: if (tlb_type == spitfire && (vma->vm_flags & VM_EXEC) != 0 && vma->vm_file != NULL) - set_thread_flag(TIF_BLKCOMMIT); + set_thread_fault_code(fault_code | + FAULT_CODE_BLKCOMMIT); } else { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_EXEC))) @@ -497,6 +498,5 @@ do_sigbus: fault_done: /* These values are no longer needed, clear them. */ set_thread_fault_code(0); - clear_thread_flag(TIF_BLKCOMMIT); current_thread_info()->fault_address = 0; } diff --git a/arch/sparc64/mm/tlb.c b/arch/sparc64/mm/tlb.c index 11a5078182c460..e2d79fc14aa488 100644 --- a/arch/sparc64/mm/tlb.c +++ b/arch/sparc64/mm/tlb.c @@ -76,7 +76,7 @@ void tlb_batch_add(pte_t *ptep, pte_t orig) /* A real file page? */ mapping = page_mapping(page); - if (!mapping || mapping == &swapper_space) + if (!mapping) goto no_cache_flush; paddr = (unsigned long) page_address(page); |