[parisc-linux-cvs] pa10 patch
Helge Deller
deller@gmx.de
Wed, 29 Aug 2001 09:45:35 +0200
On Wednesday 29 August 2001 09:40, Helge Deller wrote:
> CVSROOT: /home/cvs/parisc
> Module name: linux
> Changes by: deller 01/08/29 01:40:31
>
> Modified files:
> . : Makefile
> arch/parisc/kernel: init_task.c
> include/asm-parisc: pgtable.h processor.h
>
> Log message:
> - pa10
> - named initializers, fix compiler warning,
> - indenting fixes
Index: Makefile
===================================================================
RCS file: /home/cvs/parisc/linux/Makefile,v
retrieving revision 1.121
diff -u -r1.121 Makefile
--- Makefile 2001/08/29 03:34:43 1.121
+++ Makefile 2001/08/29 07:34:52
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 4
SUBLEVEL = 9
-EXTRAVERSION = -pa9
+EXTRAVERSION = -pa10
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
Index: arch/parisc/kernel/init_task.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/init_task.c,v
retrieving revision 1.7
diff -u -r1.7 init_task.c
--- init_task.c 2000/10/26 11:45:36 1.7
+++ init_task.c 2001/08/29 07:34:54
@@ -22,7 +22,7 @@
union task_union init_task_union
__attribute__((section("init_task"), aligned(4096))) = { INIT_TASK(init_task_union.task) };
-unsigned long swapper_pg_dir[PTRS_PER_PGD] __attribute__ ((aligned(4096))) = { 0, };
+pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__ ((aligned(4096))) = { {0}, };
#ifdef __LP64__
unsigned long pmd0[PTRS_PER_PMD] __attribute__ ((aligned(4096))) = { 0, };
#endif
Index: include/asm-parisc/pgtable.h
===================================================================
RCS file: /home/cvs/parisc/linux/include/asm-parisc/pgtable.h,v
retrieving revision 1.41
diff -u -r1.41 pgtable.h
--- pgtable.h 2001/07/06 14:39:03 1.41
+++ pgtable.h 2001/08/29 07:35:01
@@ -180,7 +180,7 @@
#define __S110 PAGE_RWX
#define __S111 PAGE_RWX
-extern unsigned long swapper_pg_dir[]; /* declared in init_task.c */
+extern pgd_t swapper_pg_dir[]; /* declared in init_task.c */
/* initial page tables for 0-8MB for kernel */
Index: include/asm-parisc/processor.h
===================================================================
RCS file: /home/cvs/parisc/linux/include/asm-parisc/processor.h,v
retrieving revision 1.44
diff -u -r1.44 processor.h
--- processor.h 2001/08/28 07:49:49 1.44
+++ processor.h 2001/08/29 07:35:02
@@ -31,8 +31,8 @@
#define current_text_addr() ({ void *pc; __asm__("\n\tblr 0,%0\n\tnop":"=r" (pc)); pc; })
-#define TASK_SIZE (0xFFF00000UL)
-#define TASK_UNMAPPED_BASE (0x40000000UL)
+#define TASK_SIZE (0xFFF00000UL)
+#define TASK_UNMAPPED_BASE (0x40000000UL)
#ifndef __ASSEMBLY__
@@ -111,27 +111,29 @@
/* Thread struct flags. */
#define PARISC_KERNEL_DEATH (1UL << 31) /* see die_if_kernel()... */
-#define INIT_MMAP { &init_mm, 0, 0, NULL, PAGE_SHARED, \
- VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL }
+#define INIT_MMAP { \
+ vm_mm: &init_mm, \
+ vm_page_prot: PAGE_SHARED, \
+ vm_flags: VM_READ | VM_WRITE | VM_EXEC, \
+ vm_avl_height: 1, \
+ }
+
+#define INIT_THREAD { \
+ regs: { gr: { 0, }, \
+ fr: { 0, }, \
+ sr: { 0, }, \
+ iasq: { 0, }, \
+ iaoq: { 0, }, \
+ cr27: 0, \
+ }, \
+ flags: __pa((unsigned long) &swapper_pg_dir) \
+ }
-#define INIT_THREAD { { \
- { 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0 }, \
- { 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0, \
- 0, 0, 0, 0, 0, 0, 0, 0 }, \
- { 0, 0, 0, 0, 0, 0, 0, 0 }, \
- { 0, 0}, { 0, 0}, 0, 0, 0, 0 \
- }, __pa((unsigned long) swapper_pg_dir) }
-
/*
* Return saved PC of a blocked thread. This is used by ps mostly.
*/
-extern inline unsigned long thread_saved_pc(struct thread_struct *t)
+static inline unsigned long thread_saved_pc(struct thread_struct *t)
{
return 0xabcdef;
}
@@ -289,22 +291,22 @@
#define copy_segments(tsk, mm) do { } while (0)
#define release_segments(mm) do { } while (0)
-extern inline unsigned long get_wchan(struct task_struct *p)
+static inline unsigned long get_wchan(struct task_struct *p)
{
return 0xdeadbeef; /* XXX */
}
-#define KSTK_EIP(tsk) ((tsk)->thread.regs.iaoq[0])
-#define KSTK_ESP(tsk) ((tsk)->thread.regs.gr[30])
+#define KSTK_EIP(tsk) ((tsk)->thread.regs.iaoq[0])
+#define KSTK_ESP(tsk) ((tsk)->thread.regs.gr[30])
#endif /* __ASSEMBLY__ */
#ifdef CONFIG_PA20
-#define prefetchw(addr) __asm__("ldd 0(%0), %%r0" : : "r" (addr))
-#define prefetch(addr) __asm__("ldw 0(%0), %%r0" : : "r" (addr))
+#define prefetchw(addr) __asm__("ldd 0(%0), %%r0" : : "r" (addr))
+#define prefetch(addr) __asm__("ldw 0(%0), %%r0" : : "r" (addr))
#else
-#define prefetchw(addr) do { } while (0)
-#define prefetch(addr) do { } while (0)
+#define prefetchw(addr) do { } while (0)
+#define prefetch(addr) do { } while (0)
#endif
/* Be sure to hunt all references to this down when you change the size of
@@ -313,9 +315,9 @@
#define THREAD_SIZE (4*PAGE_SIZE)
#define alloc_task_struct() \
- ((struct task_struct *) __get_free_pages(GFP_KERNEL,2))
-#define free_task_struct(p) free_pages((unsigned long)(p),2)
-#define get_task_struct(tsk) atomic_inc(&virt_to_page(tsk)->count)
+ ((struct task_struct *) __get_free_pages(GFP_KERNEL,2))
+#define free_task_struct(p) free_pages((unsigned long)(p),2)
+#define get_task_struct(tsk) atomic_inc(&virt_to_page(tsk)->count)
#define init_task (init_task_union.task)
#define init_stack (init_task_union.stack)