Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
- revert parts of the latest patch regarding font selection with STICON
console
- wire up the utimes() syscall for parisc
- remove the unused parisc tmpalias code and unnecessary arch*relax
defines
* 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: locks: remove redundant arch_*_relax operations
parisc: wire up sys_utimes
parisc: Remove unused CONFIG_PARISC_TMPALIAS code
partly revert commit 8a10bc9: parisc/sti_console: prefer Linux fonts over built-in ROM fonts
+6
-84
-11
arch/parisc/include/asm/page.h
-11
arch/parisc/include/asm/page.h
···
32
32
void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
33
33
struct page *pg);
34
34
35
-
/* #define CONFIG_PARISC_TMPALIAS */
36
-
37
-
#ifdef CONFIG_PARISC_TMPALIAS
38
-
void clear_user_highpage(struct page *page, unsigned long vaddr);
39
-
#define clear_user_highpage clear_user_highpage
40
-
struct vm_area_struct;
41
-
void copy_user_highpage(struct page *to, struct page *from,
42
-
unsigned long vaddr, struct vm_area_struct *vma);
43
-
#define __HAVE_ARCH_COPY_USER_HIGHPAGE
44
-
#endif
45
-
46
35
/*
47
36
* These are used to make use of C type-checking..
48
37
*/
-4
arch/parisc/include/asm/spinlock.h
-4
arch/parisc/include/asm/spinlock.h
···
191
191
#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
192
192
#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
193
193
194
-
#define arch_spin_relax(lock) cpu_relax()
195
-
#define arch_read_relax(lock) cpu_relax()
196
-
#define arch_write_relax(lock) cpu_relax()
197
-
198
194
#endif /* __ASM_SPINLOCK_H */
+2
-2
arch/parisc/include/uapi/asm/unistd.h
+2
-2
arch/parisc/include/uapi/asm/unistd.h
···
828
828
#define __NR_finit_module (__NR_Linux + 333)
829
829
#define __NR_sched_setattr (__NR_Linux + 334)
830
830
#define __NR_sched_getattr (__NR_Linux + 335)
831
+
#define __NR_utimes (__NR_Linux + 336)
831
832
832
-
#define __NR_Linux_syscalls (__NR_sched_getattr + 1)
833
+
#define __NR_Linux_syscalls (__NR_utimes + 1)
833
834
834
835
835
836
#define __IGNORE_select /* newselect */
836
837
#define __IGNORE_fadvise64 /* fadvise64_64 */
837
-
#define __IGNORE_utimes /* utime */
838
838
839
839
840
840
#define HPUX_GATEWAY_ADDR 0xC0000004
-64
arch/parisc/kernel/cache.c
-64
arch/parisc/kernel/cache.c
···
581
581
__flush_cache_page(vma, vmaddr, PFN_PHYS(pfn));
582
582
}
583
583
}
584
-
585
-
#ifdef CONFIG_PARISC_TMPALIAS
586
-
587
-
void clear_user_highpage(struct page *page, unsigned long vaddr)
588
-
{
589
-
void *vto;
590
-
unsigned long flags;
591
-
592
-
/* Clear using TMPALIAS region. The page doesn't need to
593
-
be flushed but the kernel mapping needs to be purged. */
594
-
595
-
vto = kmap_atomic(page);
596
-
597
-
/* The PA-RISC 2.0 Architecture book states on page F-6:
598
-
"Before a write-capable translation is enabled, *all*
599
-
non-equivalently-aliased translations must be removed
600
-
from the page table and purged from the TLB. (Note
601
-
that the caches are not required to be flushed at this
602
-
time.) Before any non-equivalent aliased translation
603
-
is re-enabled, the virtual address range for the writeable
604
-
page (the entire page) must be flushed from the cache,
605
-
and the write-capable translation removed from the page
606
-
table and purged from the TLB." */
607
-
608
-
purge_kernel_dcache_page_asm((unsigned long)vto);
609
-
purge_tlb_start(flags);
610
-
pdtlb_kernel(vto);
611
-
purge_tlb_end(flags);
612
-
preempt_disable();
613
-
clear_user_page_asm(vto, vaddr);
614
-
preempt_enable();
615
-
616
-
pagefault_enable(); /* kunmap_atomic(addr, KM_USER0); */
617
-
}
618
-
619
-
void copy_user_highpage(struct page *to, struct page *from,
620
-
unsigned long vaddr, struct vm_area_struct *vma)
621
-
{
622
-
void *vfrom, *vto;
623
-
unsigned long flags;
624
-
625
-
/* Copy using TMPALIAS region. This has the advantage
626
-
that the `from' page doesn't need to be flushed. However,
627
-
the `to' page must be flushed in copy_user_page_asm since
628
-
it can be used to bring in executable code. */
629
-
630
-
vfrom = kmap_atomic(from);
631
-
vto = kmap_atomic(to);
632
-
633
-
purge_kernel_dcache_page_asm((unsigned long)vto);
634
-
purge_tlb_start(flags);
635
-
pdtlb_kernel(vto);
636
-
pdtlb_kernel(vfrom);
637
-
purge_tlb_end(flags);
638
-
preempt_disable();
639
-
copy_user_page_asm(vto, vfrom, vaddr);
640
-
flush_dcache_page_asm(__pa(vto), vaddr);
641
-
preempt_enable();
642
-
643
-
pagefault_enable(); /* kunmap_atomic(addr, KM_USER1); */
644
-
pagefault_enable(); /* kunmap_atomic(addr, KM_USER0); */
645
-
}
646
-
647
-
#endif /* CONFIG_PARISC_TMPALIAS */
+1
arch/parisc/kernel/syscall_table.S
+1
arch/parisc/kernel/syscall_table.S
+3
-3
lib/fonts/Kconfig
+3
-3
lib/fonts/Kconfig
···
9
9
10
10
config FONTS
11
11
bool "Select compiled-in fonts"
12
-
depends on FRAMEBUFFER_CONSOLE
12
+
depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
13
13
help
14
14
Say Y here if you would like to use fonts other than the default
15
15
your frame buffer console usually use.
···
22
22
23
23
config FONT_8x8
24
24
bool "VGA 8x8 font" if FONTS
25
-
depends on FRAMEBUFFER_CONSOLE
25
+
depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
26
26
default y if !SPARC && !FONTS
27
27
help
28
28
This is the "high resolution" font for the VGA frame buffer (the one
···
45
45
46
46
config FONT_6x11
47
47
bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
48
-
depends on FRAMEBUFFER_CONSOLE
48
+
depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
49
49
default y if !SPARC && !FONTS && MAC
50
50
help
51
51
Small console font with Macintosh-style high-half glyphs. Some Mac