2007-11-08 02:35:48

by Jeremy Fitzhardinge

Subject: [PATCH RFC 2/7] x86: clean up mm/init_32.c

Some code reformatting in init_32.c. No functional change.

Signed-off-by: Jeremy Fitzhardinge <[email protected]>

---
arch/x86/mm/init_32.c | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)

===================================================================
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -165,16 +165,25 @@ static void __init kernel_physical_mappi
pmd = one_md_table_init(pgd);
if (pfn >= max_low_pfn)
continue;
- for (pmd_idx = 0; pmd_idx < PTRS_PER_PMD && pfn < max_low_pfn; pmd++, pmd_idx++) {
+ for (pmd_idx = 0;
+ pmd_idx < PTRS_PER_PMD && pfn < max_low_pfn;
+ pmd++, pmd_idx++) {
unsigned int address = pfn * PAGE_SIZE + PAGE_OFFSET;

- /* Map with big pages if possible, otherwise create normal page tables. */
+ /* Map with big pages if possible, otherwise
+ create normal page tables. */
if (cpu_has_pse) {
- unsigned int address2 = (pfn + PTRS_PER_PTE - 1) * PAGE_SIZE + PAGE_OFFSET + PAGE_SIZE-1;
- if (is_kernel_text(address) || is_kernel_text(address2))
- set_pmd(pmd, pfn_pmd(pfn, PAGE_KERNEL_LARGE_EXEC));
- else
- set_pmd(pmd, pfn_pmd(pfn, PAGE_KERNEL_LARGE));
+ unsigned int address2;
+ pgprot_t prot = PAGE_KERNEL_LARGE;
+
+ address2 = (pfn + PTRS_PER_PTE - 1) * PAGE_SIZE +
+ PAGE_OFFSET + PAGE_SIZE-1;
+
+ if (is_kernel_text(address) ||
+ is_kernel_text(address2))
+ prot = PAGE_KERNEL_LARGE_EXEC;
+
+ set_pmd(pmd, pfn_pmd(pfn, prot));

pfn += PTRS_PER_PTE;
} else {
@@ -183,10 +192,12 @@ static void __init kernel_physical_mappi
for (pte_ofs = 0;
pte_ofs < PTRS_PER_PTE && pfn < max_low_pfn;
pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
+ pgprot_t prot = PAGE_KERNEL;
+
if (is_kernel_text(address))
- set_pte(pte, pfn_pte(pfn, PAGE_KERNEL_EXEC));
- else
- set_pte(pte, pfn_pte(pfn, PAGE_KERNEL));
+ prot = PAGE_KERNEL_EXEC;
+
+ set_pte(pte, pfn_pte(pfn, prot));
}
}
}

--

2007-11-08 16:20:39

by Glauber Costa

Subject: Re: [PATCH RFC 2/7] x86: clean up mm/init_32.c

> - /* Map with big pages if possible, otherwise create normal page tables. */
> + /* Map with big pages if possible, otherwise
> + create normal page tables. */
/*
* multi comment lines are preferred
* this way, IIRC ;-)
*/



--
Glauber de Oliveira Costa.
"Free as in Freedom"
http://glommer.net

"The less confident you are, the more serious you have to act."

2007-11-08 16:40:24

by Jeremy Fitzhardinge

Subject: Re: [PATCH RFC 2/7] x86: clean up mm/init_32.c

Glauber de Oliveira Costa wrote:
>> - /* Map with big pages if possible, otherwise create normal page tables. */
>> + /* Map with big pages if possible, otherwise
>> + create normal page tables. */
>>
> /*
> * multi comment lines are preferred
> * this way, IIRC ;-)
> */
>

I don't think it's worth turning a one-liner into a great big banner.

J