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

Commit 7ef4de17 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'highmem' into devel 

Conflicts:

	arch/arm/mach-clps7500/include/mach/memory.h
parents f412b09f b5ee9002

arch/arm/include/asm/memory.h

+5 −2
Original line number Diff line number Diff line
@@ -112,10 +112,8 @@ 
 * private definitions which should NOT be used outside memory.h

 * files.  Use virt_to_phys/phys_to_virt/__pa/__va instead.

 */

#ifndef __virt_to_phys

#define __virt_to_phys(x)	((x) - PAGE_OFFSET + PHYS_OFFSET)

#define __phys_to_virt(x)	((x) - PHYS_OFFSET + PAGE_OFFSET)

#endif



/*

 * Convert a physical address to a Page Frame Number and back
@@ -180,6 +178,11 @@ static inline void *phys_to_virt(unsigned long x) 
 * memory.  Use of these is *deprecated* (and that doesn't mean

 * use the __ prefixed forms instead.)  See dma-mapping.h.

 */

#ifndef __virt_to_bus

#define __virt_to_bus	__virt_to_phys

#define __bus_to_virt	__phys_to_virt

#endif



static inline __deprecated unsigned long virt_to_bus(void *x)

{

	return __virt_to_bus((unsigned long)x);

arch/arm/include/asm/page.h

+18 −12
Original line number Diff line number Diff line
@@ -108,30 +108,36 @@ 
#error Unknown user operations model

#endif



struct page;



struct cpu_user_fns {

	void (*cpu_clear_user_page)(void *p, unsigned long user);

	void (*cpu_copy_user_page)(void *to, const void *from,

				   unsigned long user);

	void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);

	void (*cpu_copy_user_highpage)(struct page *to, struct page *from,

			unsigned long vaddr);

};



#ifdef MULTI_USER

extern struct cpu_user_fns cpu_user;



#define __cpu_clear_user_page	cpu_user.cpu_clear_user_page

#define __cpu_copy_user_page	cpu_user.cpu_copy_user_page

#define __cpu_clear_user_highpage	cpu_user.cpu_clear_user_highpage

#define __cpu_copy_user_highpage	cpu_user.cpu_copy_user_highpage



#else



#define __cpu_clear_user_page	__glue(_USER,_clear_user_page)

#define __cpu_copy_user_page	__glue(_USER,_copy_user_page)

#define __cpu_clear_user_highpage	__glue(_USER,_clear_user_highpage)

#define __cpu_copy_user_highpage	__glue(_USER,_copy_user_highpage)



extern void __cpu_clear_user_page(void *p, unsigned long user);

extern void __cpu_copy_user_page(void *to, const void *from,

				 unsigned long user);

extern void __cpu_clear_user_highpage(struct page *page, unsigned long vaddr);

extern void __cpu_copy_user_highpage(struct page *to, struct page *from,

			unsigned long vaddr);

#endif



#define clear_user_page(addr,vaddr,pg)	 __cpu_clear_user_page(addr, vaddr)

#define copy_user_page(to,from,vaddr,pg) __cpu_copy_user_page(to, from, vaddr)

#define clear_user_highpage(page,vaddr)		\

	 __cpu_clear_user_highpage(page, vaddr)



#define __HAVE_ARCH_COPY_USER_HIGHPAGE

#define copy_user_highpage(to,from,vaddr,vma)	\

	__cpu_copy_user_highpage(to, from, vaddr)



#define clear_page(page)	memset((void *)(page), 0, PAGE_SIZE)

extern void copy_page(void *to, const void *from);

arch/arm/include/asm/setup.h

+4 −2
Original line number Diff line number Diff line
@@ -209,9 +209,11 @@ struct meminfo { 
	struct membank bank[NR_BANKS];

};



extern struct meminfo meminfo;



#define for_each_nodebank(iter,mi,no)			\

	for (iter = 0; iter < mi->nr_banks; iter++)	\

		if (mi->bank[iter].node == no)

	for (iter = 0; iter < (mi)->nr_banks; iter++)	\

		if ((mi)->bank[iter].node == no)



#define bank_pfn_start(bank)	__phys_to_pfn((bank)->start)

#define bank_pfn_end(bank)	__phys_to_pfn((bank)->start + (bank)->size)

arch/arm/kernel/setup.c

+21 −16
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int __init fpe_setup(char *line) 
__setup("fpe=", fpe_setup);

#endif



extern void paging_init(struct meminfo *, struct machine_desc *desc);

extern void paging_init(struct machine_desc *desc);

extern void reboot_setup(char *str);

extern void _text, _etext, __data_start, _edata, _end;
@@ -112,7 +112,6 @@ static struct stack stacks[NR_CPUS]; 
char elf_platform[ELF_PLATFORM_SIZE];

EXPORT_SYMBOL(elf_platform);



static struct meminfo meminfo __initdata = { 0, };

static const char *cpu_name;

static const char *machine_name;

static char __initdata command_line[COMMAND_LINE_SIZE];
@@ -367,21 +366,34 @@ static struct machine_desc * __init setup_machine(unsigned int nr) 
	return list;

}



static void __init arm_add_memory(unsigned long start, unsigned long size)

static int __init arm_add_memory(unsigned long start, unsigned long size)

{

	struct membank *bank;

	struct membank *bank = &meminfo.bank[meminfo.nr_banks];



	if (meminfo.nr_banks >= NR_BANKS) {

		printk(KERN_CRIT "NR_BANKS too low, "

			"ignoring memory at %#lx\n", start);

		return -EINVAL;

	}



	/*

	 * Ensure that start/size are aligned to a page boundary.

	 * Size is appropriately rounded down, start is rounded up.

	 */

	size -= start & ~PAGE_MASK;



	bank = &meminfo.bank[meminfo.nr_banks++];



	bank->start = PAGE_ALIGN(start);

	bank->size  = size & PAGE_MASK;

	bank->node  = PHYS_TO_NID(start);



	/*

	 * Check whether this memory region has non-zero size or

	 * invalid node number.

	 */

	if (bank->size == 0 || bank->node >= MAX_NUMNODES)

		return -EINVAL;



	meminfo.nr_banks++;

	return 0;

}



/*
@@ -539,14 +551,7 @@ __tagtable(ATAG_CORE, parse_tag_core); 


static int __init parse_tag_mem32(const struct tag *tag)

{

	if (meminfo.nr_banks >= NR_BANKS) {

		printk(KERN_WARNING

		       "Ignoring memory bank 0x%08x size %dKB\n",

			tag->u.mem.start, tag->u.mem.size / 1024);

		return -EINVAL;

	}

	arm_add_memory(tag->u.mem.start, tag->u.mem.size);

	return 0;

	return arm_add_memory(tag->u.mem.start, tag->u.mem.size);

}



__tagtable(ATAG_MEM, parse_tag_mem32);
@@ -718,7 +723,7 @@ void __init setup_arch(char **cmdline_p) 
	memcpy(boot_command_line, from, COMMAND_LINE_SIZE);

	boot_command_line[COMMAND_LINE_SIZE-1] = '\0';

	parse_cmdline(cmdline_p, from);

	paging_init(&meminfo, mdesc);

	paging_init(mdesc);

	request_standard_resources(&meminfo, mdesc);



#ifdef CONFIG_SMP

arch/arm/mach-aaec2000/include/mach/memory.h

+0 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 


#define PHYS_OFFSET	UL(0xf0000000)



#define __virt_to_bus(x)	__virt_to_phys(x)

#define __bus_to_virt(x)	__phys_to_virt(x)



/*

 * The nodes are the followings:

 *