Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abe1ee3a authored by Tim Abbott's avatar Tim Abbott Committed by Sam Ravnborg
Browse files

Use macros for .data.page_aligned section. 



This patch changes the remaining direct references to
.data.page_aligned in C and assembly code to use the macros in
include/linux/linkage.h.

Signed-off-by: default avatarTim Abbott <tabbott@ksplice.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 02b7da37

arch/avr32/mm/init.c

+1 −3
Original line number Diff line number Diff line
@@ -24,11 +24,9 @@ 
#include <asm/setup.h>

#include <asm/sections.h>



#define __page_aligned	__attribute__((section(".data.page_aligned")))



DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);



pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned;

pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_data;



struct page *empty_zero_page;

EXPORT_SYMBOL(empty_zero_page);

arch/powerpc/kernel/vdso.c

+2 −1
Original line number Diff line number Diff line 


/*

 *    Copyright (C) 2004 Benjamin Herrenschmidt, IBM Corp.

 *			 <benh@kernel.crashing.org>
@@ -74,7 +75,7 @@ static int vdso_ready; 
static union {

	struct vdso_data	data;

	u8			page[PAGE_SIZE];

} vdso_data_store __attribute__((__section__(".data.page_aligned")));

} vdso_data_store __page_aligned_data;

struct vdso_data *vdso_data = &vdso_data_store.data;



/* Format of the patch table */

arch/powerpc/kernel/vdso32/vdso32_wrapper.S

+2 −1
Original line number Diff line number Diff line 
#include <linux/init.h>

#include <linux/linkage.h>

#include <asm/page.h>



	.section ".data.page_aligned"

	__PAGE_ALIGNED_DATA



	.globl vdso32_start, vdso32_end

	.balign PAGE_SIZE

arch/powerpc/kernel/vdso64/vdso64_wrapper.S

+2 −1
Original line number Diff line number Diff line 
#include <linux/init.h>

#include <linux/linkage.h>

#include <asm/page.h>



	.section ".data.page_aligned"

	__PAGE_ALIGNED_DATA



	.globl vdso64_start, vdso64_end

	.balign PAGE_SIZE

arch/s390/kernel/vdso.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ __setup("vdso=", vdso_setup); 
static union {

	struct vdso_data	data;

	u8			page[PAGE_SIZE];

} vdso_data_store __attribute__((__section__(".data.page_aligned")));

} vdso_data_store __page_aligned_data;

struct vdso_data *vdso_data = &vdso_data_store.data;



/*