Commit f71ea0fb authored by Deepak Saxena's avatar Deepak Saxena Committed by Russell King

[ARM PATCH] 2270/1: [Trivial] Remove reference to head-armv.S

Patch from Deepak Saxena

arch/arm/kernel/head-armv.S is now simply head.S.  This patches updates
references in kernel comments.

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King
parent 8c2bfc5b
...@@ -163,9 +163,9 @@ CONFIG_MACH_ and CONFIG_ARCH_ ...@@ -163,9 +163,9 @@ CONFIG_MACH_ and CONFIG_ARCH_
<http://www.arm.linux.org.uk/developer/machines/> <http://www.arm.linux.org.uk/developer/machines/>
Kernel entry (head-armv.S) Kernel entry (head.S)
-------------------------- --------------------------
The initial entry into the kernel is via head-armv.S, which uses machine The initial entry into the kernel is via head.S, which uses machine
independent code. The machine is selected by the value of 'r1' on independent code. The machine is selected by the value of 'r1' on
entry, which must be kept unique. entry, which must be kept unique.
......
/* /*
* linux/arch/arm/kernel/head-armv.S * linux/arch/arm/kernel/head.S
* *
* Copyright (C) 1994-2002 Russell King * Copyright (C) 1994-2002 Russell King
* *
......
...@@ -138,7 +138,7 @@ __arm710_setup: mov r0, #0 ...@@ -138,7 +138,7 @@ __arm710_setup: mov r0, #0
bic r0, r0, #0x0e00 @ ..V. ..RS BLDP WCAM bic r0, r0, #0x0e00 @ ..V. ..RS BLDP WCAM
orr r0, r0, #0x0100 @ .... .... .111 .... (old) orr r0, r0, #0x0100 @ .... .... .111 .... (old)
orr r0, r0, #0x003d @ .... ..01 ..11 1101 (new) orr r0, r0, #0x003d @ .... ..01 ..11 1101 (new)
mov pc, lr @ __ret (head-armv.S) mov pc, lr @ __ret (head.S)
.size __arm710_setup, . - __arm710_setup .size __arm710_setup, . - __arm710_setup
.type __arm720_setup, #function .type __arm720_setup, #function
...@@ -153,7 +153,7 @@ __arm720_setup: mov r0, #0 ...@@ -153,7 +153,7 @@ __arm720_setup: mov r0, #0
bic r0, r0, #0x0e00 @ ..V. ..RS BLDP WCAM bic r0, r0, #0x0e00 @ ..V. ..RS BLDP WCAM
orr r0, r0, #0x2100 @ .... .... .111 .... (old) orr r0, r0, #0x2100 @ .... .... .111 .... (old)
orr r0, r0, #0x003d @ ..1. ..01 ..11 1101 (new) orr r0, r0, #0x003d @ ..1. ..01 ..11 1101 (new)
mov pc, lr @ __ret (head-armv.S) mov pc, lr @ __ret (head.S)
.size __arm720_setup, . - __arm720_setup .size __arm720_setup, . - __arm720_setup
__INITDATA __INITDATA
......
...@@ -24,13 +24,13 @@ struct processor; ...@@ -24,13 +24,13 @@ struct processor;
* *
* NOTE! The following structure is defined by assembly * NOTE! The following structure is defined by assembly
* language, NOT C code. For more information, check: * language, NOT C code. For more information, check:
* arch/arm/mm/proc-*.S and arch/arm/kernel/head-armv.S * arch/arm/mm/proc-*.S and arch/arm/kernel/head.S
*/ */
struct proc_info_list { struct proc_info_list {
unsigned int cpu_val; unsigned int cpu_val;
unsigned int cpu_mask; unsigned int cpu_mask;
unsigned long __cpu_mmu_flags; /* used by head-armv.S */ unsigned long __cpu_mmu_flags; /* used by head.S */
unsigned long __cpu_flush; /* used by head-armv.S */ unsigned long __cpu_flush; /* used by head.S */
const char *arch_name; const char *arch_name;
const char *elf_name; const char *elf_name;
unsigned int elf_hwcap; unsigned int elf_hwcap;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment