Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a23ba43573a24c351640bc19c06c701798fe6e25

Authored by Paul Mundt
1 parent 4b27c47cf8
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

sh: comment tidying for sh64->sh migration. 

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Showing 30 changed files with 150 additions and 190 deletions Side-by-side Diff

arch/sh/boards/cayman/led.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * arch/sh64/mach-cayman/led.c
  2 + * arch/sh/boards/cayman/led.c
3 3 *
4 4 * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com>
5 5 *
arch/sh/boot/compressed/Makefile_64
Diff comments   View file @ a23ba43
1 1 #
2   -# linux/arch/sh64/boot/compressed/Makefile
  2 +# arch/sh/boot/compressed/Makefile_64
3 3 #
4   -# This file is subject to the terms and conditions of the GNU General Public
5   -# License. See the file "COPYING" in the main directory of this archive
6   -# for more details.
  4 +# create a compressed vmlinux image from the original vmlinux
7 5 #
8 6 # Copyright (C) 2002 Stuart Menefy
9 7 # Copyright (C) 2004 Paul Mundt
10 8 #
11   -# create a compressed vmlinux image from the original vmlinux
  9 +# This file is subject to the terms and conditions of the GNU General Public
  10 +# License. See the file "COPYING" in the main directory of this archive
  11 +# for more details.
12 12 #
13 13  
14 14 targets := vmlinux vmlinux.bin vmlinux.bin.gz \
arch/sh/boot/compressed/misc_64.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * arch/sh64/boot/compressed/misc.c
  2 + * arch/sh/boot/compressed/misc_64.c
3 3 *
4 4 * This is a collection of several routines from gzip-1.0.3
5 5 * adapted for Linux.
arch/sh/kernel/cpu/irq/intc-sh5.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * This file is subject to the terms and conditions of the GNU General Public
3   - * License. See the file "COPYING" in the main directory of this archive
4   - * for more details.
  2 + * arch/sh/kernel/cpu/irq/intc-sh5.c
5 3 *
6   - * arch/sh64/kernel/irq_intc.c
  4 + * Interrupt Controller support for SH5 INTC.
7 5 *
8 6 * Copyright (C) 2000, 2001 Paolo Alberelli
9 7 * Copyright (C) 2003 Paul Mundt
10 8 *
11   - * Interrupt Controller support for SH5 INTC.
12 9 * Per-interrupt selective. IRLM=0 (Fixed priority) is not
13 10 * supported being useless without a cascaded interrupt
14 11 * controller.
15 12 *
  13 + * This file is subject to the terms and conditions of the GNU General Public
  14 + * License. See the file "COPYING" in the main directory of this archive
  15 + * for more details.
16 16 */
17 17 #include <linux/init.h>
18 18 #include <linux/interrupt.h>
arch/sh/kernel/cpu/sh5/entry.S
Diff comments   View file @ a23ba43
1 1 /*
2   - * This file is subject to the terms and conditions of the GNU General Public
3   - * License. See the file "COPYING" in the main directory of this archive
4   - * for more details.
  2 + * arch/sh/kernel/cpu/sh5/entry.S
5 3 *
6   - * arch/sh64/kernel/entry.S
7   - *
8 4 * Copyright (C) 2000, 2001 Paolo Alberelli
9   - * Copyright (C) 2004, 2005 Paul Mundt
10   - * Copyright (C) 2003, 2004 Richard Curnow
  5 + * Copyright (C) 2004 - 2007 Paul Mundt
  6 + * Copyright (C) 2003, 2004 Richard Curnow
11 7 *
  8 + * This file is subject to the terms and conditions of the GNU General Public
  9 + * License. See the file "COPYING" in the main directory of this archive
  10 + * for more details.
12 11 */
13 12 #include <linux/errno.h>
14 13 #include <linux/sys.h>
arch/sh/kernel/cpu/sh5/fpu.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * This file is subject to the terms and conditions of the GNU General Public
3   - * License. See the file "COPYING" in the main directory of this archive
4   - * for more details.
  2 + * arch/sh/kernel/cpu/sh5/fpu.c
5 3 *
6   - * arch/sh64/kernel/fpu.c
7   - *
8 4 * Copyright (C) 2001 Manuela Cirronis, Paolo Alberelli
9 5 * Copyright (C) 2002 STMicroelectronics Limited
10 6 * Author : Stuart Menefy
11 7  
... ... @@ -12,8 +8,10 @@
12 8 * Started from SH4 version:
13 9 * Copyright (C) 1999, 2000 Kaz Kojima & Niibe Yutaka
14 10 *
  11 + * This file is subject to the terms and conditions of the GNU General Public
  12 + * License. See the file "COPYING" in the main directory of this archive
  13 + * for more details.
15 14 */
16   -
17 15 #include <linux/sched.h>
18 16 #include <linux/signal.h>
19 17 #include <asm/processor.h>
arch/sh/kernel/cpu/sh5/switchto.S
Diff comments   View file @ a23ba43
1 1 /*
2   - * arch/sh64/kernel/switchto.S
  2 + * arch/sh/kernel/cpu/sh5/switchto.S
3 3 *
4 4 * sh64 context switch
5 5 *
arch/sh/kernel/cpu/sh5/unwind.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * arch/sh64/kernel/unwind.c
  2 + * arch/sh/kernel/cpu/sh5/unwind.c
3 3 *
4 4 * Copyright (C) 2004 Paul Mundt
5 5 * Copyright (C) 2004 Richard Curnow
arch/sh/kernel/head_64.S
Diff comments   View file @ a23ba43
1 1 /*
2   - * This file is subject to the terms and conditions of the GNU General Public
3   - * License. See the file "COPYING" in the main directory of this archive
4   - * for more details.
  2 + * arch/sh/kernel/head_64.S
5 3 *
6   - * arch/sh64/kernel/head.S
7   - *
8 4 * Copyright (C) 2000, 2001 Paolo Alberelli
9 5 * Copyright (C) 2003, 2004 Paul Mundt
10 6 *
11   - *
12   - * benedict.gaster@superh.com: 2nd May 2002
13   - * Moved definition of empty_zero_page to its own section allowing
14   - * it to be placed at an absolute address known at load time.
15   - *
16   - * lethal@linux-sh.org: 9th May 2003
17   - * Kill off GLOBAL_NAME() usage.
18   - *
19   - * lethal@linux-sh.org: 8th May 2004
20   - * Add early SCIF console DTLB mapping.
  7 + * This file is subject to the terms and conditions of the GNU General Public
  8 + * License. See the file "COPYING" in the main directory of this archive
  9 + * for more details.
21 10 */
22 11 #include <asm/page.h>
23 12 #include <asm/cache.h>
arch/sh/kernel/process_64.c
Diff comments   View file @ a23ba43
... ... @@ -421,19 +421,22 @@
421 421 */
422 422 void exit_thread(void)
423 423 {
424   - /* See arch/sparc/kernel/process.c for the precedent for doing this -- RPC.
425   -
426   - The SH-5 FPU save/restore approach relies on last_task_used_math
427   - pointing to a live task_struct. When another task tries to use the
428   - FPU for the 1st time, the FPUDIS trap handling (see
429   - arch/sh64/kernel/fpu.c) will save the existing FPU state to the
430   - FP regs field within last_task_used_math before re-loading the new
431   - task's FPU state (or initialising it if the FPU has been used
432   - before). So if last_task_used_math is stale, and its page has already been
433   - re-allocated for another use, the consequences are rather grim. Unless we
434   - null it here, there is no other path through which it would get safely
435   - nulled. */
436   -
  424 + /*
  425 + * See arch/sparc/kernel/process.c for the precedent for doing
  426 + * this -- RPC.
  427 + *
  428 + * The SH-5 FPU save/restore approach relies on
  429 + * last_task_used_math pointing to a live task_struct. When
  430 + * another task tries to use the FPU for the 1st time, the FPUDIS
  431 + * trap handling (see arch/sh/kernel/cpu/sh5/fpu.c) will save the
  432 + * existing FPU state to the FP regs field within
  433 + * last_task_used_math before re-loading the new task's FPU state
  434 + * (or initialising it if the FPU has been used before). So if
  435 + * last_task_used_math is stale, and its page has already been
  436 + * re-allocated for another use, the consequences are rather
  437 + * grim. Unless we null it here, there is no other path through
  438 + * which it would get safely nulled.
  439 + */
437 440 #ifdef CONFIG_SH_FPU
438 441 if (last_task_used_math == current) {
439 442 last_task_used_math = NULL;
arch/sh/kernel/sh_ksyms_64.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * This file is subject to the terms and conditions of the GNU General Public
3   - * License. See the file "COPYING" in the main directory of this archive
4   - * for more details.
  2 + * arch/sh/kernel/sh_ksyms_64.c
5 3 *
6   - * arch/sh64/kernel/sh_ksyms.c
7   - *
8 4 * Copyright (C) 2000, 2001 Paolo Alberelli
9 5 *
  6 + * This file is subject to the terms and conditions of the GNU General Public
  7 + * License. See the file "COPYING" in the main directory of this archive
  8 + * for more details.
10 9 */
11 10 #include <linux/rwsem.h>
12 11 #include <linux/module.h>
arch/sh/kernel/signal_64.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * This file is subject to the terms and conditions of the GNU General Public
3   - * License. See the file "COPYING" in the main directory of this archive
4   - * for more details.
  2 + * arch/sh/kernel/signal_64.c
5 3 *
6   - * arch/sh64/kernel/signal.c
7   - *
8 4 * Copyright (C) 2000, 2001 Paolo Alberelli
9 5 * Copyright (C) 2003 Paul Mundt
10 6 * Copyright (C) 2004 Richard Curnow
11 7 *
12   - * Started from sh version.
13   - *
  8 + * This file is subject to the terms and conditions of the GNU General Public
  9 + * License. See the file "COPYING" in the main directory of this archive
  10 + * for more details.
14 11 */
15 12 #include <linux/rwsem.h>
16 13 #include <linux/sched.h>
arch/sh/kernel/syscalls_64.S
Diff comments   View file @ a23ba43
1 1 /*
2   - * arch/sh64/kernel/syscalls.S
  2 + * arch/sh/kernel/syscalls_64.S
3 3 *
4 4 * Copyright (C) 2000, 2001 Paolo Alberelli
5 5 * Copyright (C) 2004 - 2007 Paul Mundt
arch/sh/kernel/time_64.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * This file is subject to the terms and conditions of the GNU General Public
3   - * License. See the file "COPYING" in the main directory of this archive
4   - * for more details.
  2 + * arch/sh/kernel/time_64.c
5 3 *
6   - * arch/sh64/kernel/time.c
7   - *
8 4 * Copyright (C) 2000, 2001 Paolo Alberelli
9 5 * Copyright (C) 2003 - 2007 Paul Mundt
10 6 * Copyright (C) 2003 Richard Curnow
... ... @@ -13,6 +9,10 @@
13 9 * Copyright (C) 1999 Tetsuya Okada & Niibe Yutaka
14 10 * Some code taken from i386 version.
15 11 * Copyright (C) 1991, 1992, 1995 Linus Torvalds
  12 + *
  13 + * This file is subject to the terms and conditions of the GNU General Public
  14 + * License. See the file "COPYING" in the main directory of this archive
  15 + * for more details.
16 16 */
17 17 #include <linux/errno.h>
18 18 #include <linux/rwsem.h>
arch/sh/kernel/traps_64.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * This file is subject to the terms and conditions of the GNU General Public
3   - * License. See the file "COPYING" in the main directory of this archive
4   - * for more details.
  2 + * arch/sh/kernel/traps_64.c
5 3 *
6   - * arch/sh64/kernel/traps.c
7   - *
8 4 * Copyright (C) 2000, 2001 Paolo Alberelli
9 5 * Copyright (C) 2003, 2004 Paul Mundt
10 6 * Copyright (C) 2003, 2004 Richard Curnow
11 7 *
12   - */
13   -
14   -/*
15   - * 'Traps.c' handles hardware traps and faults after we have saved some
16   - * state in 'entry.S'.
  8 + * This file is subject to the terms and conditions of the GNU General Public
  9 + * License. See the file "COPYING" in the main directory of this archive
  10 + * for more details.
17 11 */
18 12 #include <linux/sched.h>
19 13 #include <linux/kernel.h>
arch/sh/lib64/c-checksum.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * arch/sh64/lib/c-checksum.c
  2 + * arch/sh/lib64/c-checksum.c
3 3 *
4 4 * This file contains network checksum routines that are better done
5 5 * in an architecture-specific manner due to speed..
6 6 */
7   -
8   -#undef DEBUG
9   -
10 7 #include <linux/string.h>
11 8 #include <linux/errno.h>
12 9 #include <linux/kernel.h>
... ... @@ -2,7 +2,7 @@
2 2 --
3 3 -- Identity : Linux50 Debug Funcions
4 4 --
5   --- File : arch/sh64/lib/dbg.C
  5 +-- File : arch/sh/lib64/dbg.c
6 6 --
7 7 -- Copyright 2000, 2001 STMicroelectronics Limited.
8 8 -- Copyright 2004 Richard Curnow (evt_debug etc)
arch/sh/lib64/udelay.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * arch/sh64/lib/udelay.c
  2 + * arch/sh/lib64/udelay.c
3 3 *
4 4 * Delay routines, using a pre-computed "loops_per_jiffy" value.
5 5 *
arch/sh/mm/cache-sh5.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * This file is subject to the terms and conditions of the GNU General Public
3   - * License. See the file "COPYING" in the main directory of this archive
4   - * for more details.
  2 + * arch/sh/mm/cache-sh5.c
5 3 *
6   - * arch/sh64/mm/cache.c
7   - *
8 4 * Original version Copyright (C) 2000, 2001 Paolo Alberelli
9 5 * Second version Copyright (C) benedict.gaster@superh.com 2002
10 6 * Third version Copyright Richard.Curnow@superh.com 2003
11 7 * Hacks to third version Copyright (C) 2003 Paul Mundt
  8 + *
  9 + * This file is subject to the terms and conditions of the GNU General Public
  10 + * License. See the file "COPYING" in the main directory of this archive
  11 + * for more details.
12 12 */
13   -
14   -/****************************************************************************/
15   -
16 13 #include <linux/init.h>
17 14 #include <linux/mman.h>
18 15 #include <linux/mm.h>
... ... @@ -146,7 +143,7 @@
146 143 /* The following group of functions deal with mapping and unmapping a temporary
147 144 page into the DTLB slot that have been set aside for our exclusive use. */
148 145 /* In order to accomplish this, we use the generic interface for adding and
149   - removing a wired slot entry as defined in arch/sh64/mm/tlb.c */
  146 + removing a wired slot entry as defined in arch/sh/mm/tlb-sh5.c */
150 147 /****************************************************************************/
151 148  
152 149 static unsigned long slot_own_flags;
arch/sh/mm/extable_64.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * This file is subject to the terms and conditions of the GNU General Public
3   - * License. See the file "COPYING" in the main directory of this archive
4   - * for more details.
  2 + * arch/sh/mm/extable_64.c
5 3 *
6   - * arch/sh64/mm/extable.c
7   - *
8 4 * Copyright (C) 2003 Richard Curnow
9 5 * Copyright (C) 2003, 2004 Paul Mundt
10 6 *
11 7 * Cloned from the 2.5 SH version..
  8 + *
  9 + * This file is subject to the terms and conditions of the GNU General Public
  10 + * License. See the file "COPYING" in the main directory of this archive
  11 + * for more details.
12 12 */
13 13 #include <linux/rwsem.h>
14 14 #include <linux/module.h>
... ... @@ -21,13 +21,16 @@
21 21 .fixup = (unsigned long)&__copy_user_fixup,
22 22 };
23 23  
24   -/* Some functions that may trap due to a bad user-mode address have too many loads
25   - and stores in them to make it at all practical to label each one and put them all in
26   - the main exception table.
27   -
28   - In particular, the fast memcpy routine is like this. It's fix-up is just to fall back
29   - to a slow byte-at-a-time copy, which is handled the conventional way. So it's functionally
30   - OK to just handle any trap occurring in the fast memcpy with that fixup. */
  24 +/*
  25 + * Some functions that may trap due to a bad user-mode address have too
  26 + * many loads and stores in them to make it at all practical to label
  27 + * each one and put them all in the main exception table.
  28 + *
  29 + * In particular, the fast memcpy routine is like this. It's fix-up is
  30 + * just to fall back to a slow byte-at-a-time copy, which is handled the
  31 + * conventional way. So it's functionally OK to just handle any trap
  32 + * occurring in the fast memcpy with that fixup.
  33 + */
31 34 static const struct exception_table_entry *check_exception_ranges(unsigned long addr)
32 35 {
33 36 if ((addr >= (unsigned long)&copy_user_memcpy) &&
arch/sh/mm/tlb-sh5.c
Diff comments   View file @ a23ba43
1 1 /*
2   - * arch/sh64/mm/tlb.c
  2 + * arch/sh/mm/tlb-sh5.c
3 3 *
4 4 * Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org>
5 5 * Copyright (C) 2003 Richard Curnow <richard.curnow@superh.com>
... ... @@ -7,7 +7,6 @@
7 7 * This file is subject to the terms and conditions of the GNU General Public
8 8 * License. See the file "COPYING" in the main directory of this archive
9 9 * for more details.
10   - *
11 10 */
12 11 #include <linux/mm.h>
13 12 #include <linux/init.h>
include/asm-sh/checksum_64.h
Diff comments   View file @ a23ba43
1   -#ifndef __ASM_SH64_CHECKSUM_H
2   -#define __ASM_SH64_CHECKSUM_H
  1 +#ifndef __ASM_SH_CHECKSUM_64_H
  2 +#define __ASM_SH_CHECKSUM_64_H
3 3  
4 4 /*
5   - * This file is subject to the terms and conditions of the GNU General Public
6   - * License. See the file "COPYING" in the main directory of this archive
7   - * for more details.
  5 + * include/asm-sh/checksum_64.h
8 6 *
9   - * include/asm-sh64/checksum.h
10   - *
11 7 * Copyright (C) 2000, 2001 Paolo Alberelli
12 8 *
  9 + * This file is subject to the terms and conditions of the GNU General Public
  10 + * License. See the file "COPYING" in the main directory of this archive
  11 + * for more details.
13 12 */
14 13  
15 14 /*
... ... @@ -76,5 +75,5 @@
76 75 return csum_fold(csum_partial(buff, len, 0));
77 76 }
78 77  
79   -#endif /* __ASM_SH64_CHECKSUM_H */
  78 +#endif /* __ASM_SH_CHECKSUM_64_H */
include/asm-sh/cpu-sh5/cache.h
Diff comments   View file @ a23ba43
1   -#ifndef __ASM_SH64_CACHE_H
2   -#define __ASM_SH64_CACHE_H
  1 +#ifndef __ASM_SH_CPU_SH5_CACHE_H
  2 +#define __ASM_SH_CPU_SH5_CACHE_H
3 3  
4 4 /*
5   - * This file is subject to the terms and conditions of the GNU General Public
6   - * License. See the file "COPYING" in the main directory of this archive
7   - * for more details.
  5 + * include/asm-sh/cpu-sh5/cache.h
8 6 *
9   - * include/asm-sh64/cache.h
10   - *
11 7 * Copyright (C) 2000, 2001 Paolo Alberelli
12 8 * Copyright (C) 2003, 2004 Paul Mundt
13 9 *
  10 + * This file is subject to the terms and conditions of the GNU General Public
  11 + * License. See the file "COPYING" in the main directory of this archive
  12 + * for more details.
14 13 */
15 14  
16 15 #define L1_CACHE_SHIFT 5
... ... @@ -95,5 +94,5 @@
95 94 * No Instruction Cache defines required, then.
96 95 */
97 96  
98   -#endif /* __ASM_SH64_CACHE_H */
  97 +#endif /* __ASM_SH_CPU_SH5_CACHE_H */
include/asm-sh/cpu-sh5/cacheflush.h
Diff comments   View file @ a23ba43
1   -#ifndef __ASM_SH64_CACHEFLUSH_H
2   -#define __ASM_SH64_CACHEFLUSH_H
  1 +#ifndef __ASM_SH_CPU_SH5_CACHEFLUSH_H
  2 +#define __ASM_SH_CPU_SH5_CACHEFLUSH_H
3 3  
4 4 #ifndef __ASSEMBLY__
5 5  
... ... @@ -31,5 +31,5 @@
31 31  
32 32 #endif /* __ASSEMBLY__ */
33 33  
34   -#endif /* __ASM_SH64_CACHEFLUSH_H */
  34 +#endif /* __ASM_SH_CPU_SH5_CACHEFLUSH_H */
include/asm-sh/cpu-sh5/irq.h
Diff comments   View file @ a23ba43
1   -#ifndef __ASM_SH64_IRQ_H
2   -#define __ASM_SH64_IRQ_H
  1 +#ifndef __ASM_SH_CPU_SH5_IRQ_H
  2 +#define __ASM_SH_CPU_SH5_IRQ_H
3 3  
4 4 /*
5   - * This file is subject to the terms and conditions of the GNU General Public
6   - * License. See the file "COPYING" in the main directory of this archive
7   - * for more details.
  5 + * include/asm-sh/cpu-sh5/irq.h
8 6 *
9   - * include/asm-sh64/irq.h
10   - *
11 7 * Copyright (C) 2000, 2001 Paolo Alberelli
12 8 *
  9 + * This file is subject to the terms and conditions of the GNU General Public
  10 + * License. See the file "COPYING" in the main directory of this archive
  11 + * for more details.
13 12 */
14 13  
15 14  
... ... @@ -115,5 +114,5 @@
115 114 int intc_irq_describe(char* p, int irq);
116 115 extern int platform_int_priority[NR_INTC_IRQS];
117 116  
118   -#endif /* __ASM_SH64_IRQ_H */
  117 +#endif /* __ASM_SH_CPU_SH5_IRQ_H */
include/asm-sh/cpu-sh5/registers.h
Diff comments   View file @ a23ba43
1   -#ifndef __ASM_SH64_REGISTERS_H
2   -#define __ASM_SH64_REGISTERS_H
  1 +#ifndef __ASM_SH_CPU_SH5_REGISTERS_H
  2 +#define __ASM_SH_CPU_SH5_REGISTERS_H
3 3  
4 4 /*
5   - * This file is subject to the terms and conditions of the GNU General Public
6   - * License. See the file "COPYING" in the main directory of this archive
7   - * for more details.
  5 + * include/asm-sh/cpu-sh5/registers.h
8 6 *
9   - * include/asm-sh64/registers.h
10   - *
11 7 * Copyright (C) 2000, 2001 Paolo Alberelli
12 8 * Copyright (C) 2004 Richard Curnow
  9 + *
  10 + * This file is subject to the terms and conditions of the GNU General Public
  11 + * License. See the file "COPYING" in the main directory of this archive
  12 + * for more details.
13 13 */
14 14  
15 15 #ifdef __ASSEMBLY__
... ... @@ -103,5 +103,5 @@
103 103 #define __USR __str(USR)
104 104  
105 105 #endif /* __ASSEMBLY__ */
106   -#endif /* __ASM_SH64_REGISTERS_H */
  106 +#endif /* __ASM_SH_CPU_SH5_REGISTERS_H */
include/asm-sh/pgtable_64.h
Diff comments   View file @ a23ba43
1   -#ifndef __ASM_SH64_PGTABLE_H
2   -#define __ASM_SH64_PGTABLE_H
  1 +#ifndef __ASM_SH_PGTABLE_64_H
  2 +#define __ASM_SH_PGTABLE_64_H
3 3  
4 4 /*
5   - * This file is subject to the terms and conditions of the GNU General Public
6   - * License. See the file "COPYING" in the main directory of this archive
7   - * for more details.
  5 + * include/asm-sh/pgtable_64.h
8 6 *
9   - * include/asm-sh64/pgtable.h
  7 + * This file contains the functions and defines necessary to modify and use
  8 + * the SuperH page table tree.
10 9 *
11 10 * Copyright (C) 2000, 2001 Paolo Alberelli
12 11 * Copyright (C) 2003, 2004 Paul Mundt
13 12 * Copyright (C) 2003, 2004 Richard Curnow
14 13 *
15   - * This file contains the functions and defines necessary to modify and use
16   - * the SuperH page table tree.
  14 + * This file is subject to the terms and conditions of the GNU General Public
  15 + * License. See the file "COPYING" in the main directory of this archive
  16 + * for more details.
17 17 */
18   -
19 18 #include <linux/threads.h>
20 19 #include <asm/processor.h>
21 20 #include <asm/page.h>
... ... @@ -297,5 +296,5 @@
297 296 #define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
298 297 #define pfn_pmd(pfn, prot) __pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
299 298  
300   -#endif /* __ASM_SH64_PGTABLE_H */
  299 +#endif /* __ASM_SH_PGTABLE_64_H */
include/asm-sh/string_64.h
Diff comments   View file @ a23ba43
1   -#ifndef __ASM_SH64_STRING_H
2   -#define __ASM_SH64_STRING_H
  1 +#ifndef __ASM_SH_STRING_64_H
  2 +#define __ASM_SH_STRING_64_H
3 3  
4 4 /*
5   - * This file is subject to the terms and conditions of the GNU General Public
6   - * License. See the file "COPYING" in the main directory of this archive
7   - * for more details.
  5 + * include/asm-sh/string_64.h
8 6 *
9   - * include/asm-sh64/string.h
10   - *
11 7 * Copyright (C) 2000, 2001 Paolo Alberelli
12 8 *
13   - * Empty on purpose. ARCH SH64 ASM libs are out of the current project scope.
14   - *
  9 + * This file is subject to the terms and conditions of the GNU General Public
  10 + * License. See the file "COPYING" in the main directory of this archive
  11 + * for more details.
15 12 */
16 13  
17 14 #define __HAVE_ARCH_MEMCPY
18   -
19 15 extern void *memcpy(void *dest, const void *src, size_t count);
20 16  
21   -#endif
  17 +#endif /* __ASM_SH_STRING_64_H */
include/asm-sh/uaccess_64.h
Diff comments   View file @ a23ba43
1   -#ifndef __ASM_SH64_UACCESS_H
2   -#define __ASM_SH64_UACCESS_H
  1 +#ifndef __ASM_SH_UACCESS_64_H
  2 +#define __ASM_SH_UACCESS_64_H
3 3  
4 4 /*
5   - * This file is subject to the terms and conditions of the GNU General Public
6   - * License. See the file "COPYING" in the main directory of this archive
7   - * for more details.
  5 + * include/asm-sh/uaccess_64.h
8 6 *
9   - * include/asm-sh64/uaccess.h
10   - *
11 7 * Copyright (C) 2000, 2001 Paolo Alberelli
12 8 * Copyright (C) 2003, 2004 Paul Mundt
13 9 *
14 10  
... ... @@ -20,8 +16,10 @@
20 16 * Copyright (C) 1996, 1997, 1998 by Ralf Baechle
21 17 * and i386 version.
22 18 *
  19 + * This file is subject to the terms and conditions of the GNU General Public
  20 + * License. See the file "COPYING" in the main directory of this archive
  21 + * for more details.
23 22 */
24   -
25 23 #include <linux/errno.h>
26 24 #include <linux/sched.h>
27 25  
... ... @@ -301,5 +299,5 @@
301 299 extern unsigned long search_exception_table(unsigned long addr);
302 300 extern const struct exception_table_entry *search_exception_tables (unsigned long addr);
303 301  
304   -#endif /* __ASM_SH64_UACCESS_H */
  302 +#endif /* __ASM_SH_UACCESS_64_H */
include/asm-sh/unistd_64.h
Diff comments   View file @ a23ba43
1   -#ifndef __ASM_SH64_UNISTD_H
2   -#define __ASM_SH64_UNISTD_H
  1 +#ifndef __ASM_SH_UNISTD_64_H
  2 +#define __ASM_SH_UNISTD_64_H
3 3  
4 4 /*
5   - * This file is subject to the terms and conditions of the GNU General Public
6   - * License. See the file "COPYING" in the main directory of this archive
7   - * for more details.
  5 + * include/asm-sh/unistd_64.h
8 6 *
9   - * include/asm-sh64/unistd.h
  7 + * This file contains the system call numbers.
10 8 *
11 9 * Copyright (C) 2000, 2001 Paolo Alberelli
12 10 * Copyright (C) 2003 - 2007 Paul Mundt
13 11 * Copyright (C) 2004 Sean McGoogan
14 12 *
15   - * This file contains the system call numbers.
16   - *
  13 + * This file is subject to the terms and conditions of the GNU General Public
  14 + * License. See the file "COPYING" in the main directory of this archive
  15 + * for more details.
17 16 */
18   -
19 17 #define __NR_restart_syscall 0
20 18 #define __NR_exit 1
21 19 #define __NR_fork 2
... ... @@ -414,5 +412,5 @@
414 412 #endif
415 413  
416 414 #endif /* __KERNEL__ */
417   -#endif /* __ASM_SH64_UNISTD_H */
  415 +#endif /* __ASM_SH_UNISTD_64_H */