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

Commit 1c16d242 authored by Tejun Heo's avatar Tejun Heo
Browse files

memblock: Fix include breakages caused by 24aa0788 



24aa0788 (memblock, x86: Replace memblock_x86_reserve/free_range()
with generic ones) removed arch/x86/include/asm/memblock.h and dropped
its inclusion from include/linux/memblock.h which breaks other
architectures which depended on the generic memblock.h pulling in the
arch specific one.

However, the proper fix isn't adding back the asm inclusion.  memblock
doesn't have any arch dependent part and doesn't need arch specific
header file and asm/memblock.h files are either practically empty or
contain mostly unrelated arch specific stuff.

* In microblaze, sh, powerpc, sparc and openrisc, asm/memblock.h is
  either empty or just contains unused MEMBLOCK_DBG() macro.  Remove
  them.

* In arm and unicore32, asm/memblock.h contains arch specific stuff.
  Include it directly from its users.  It might be a good idea to
  rename the header file to avoid confusion.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatar"H. Peter Anvin" <hpa@zytor.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
parent d4bbf7e7

arch/arm/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <asm/mach/time.h>

#include <asm/traps.h>

#include <asm/unwind.h>

#include <asm/memblock.h>



#if defined(CONFIG_DEPRECATED_PARAM_STRUCT)

#include "compat.h"

arch/arm/mm/init.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/memblock.h>



#include "mm.h"

arch/microblaze/include/asm/memblock.h

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 Michal Simek <monstr@monstr.eu>

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_MEMBLOCK_H

#define _ASM_MICROBLAZE_MEMBLOCK_H



#endif /* _ASM_MICROBLAZE_MEMBLOCK_H */

arch/openrisc/include/asm/memblock.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
/*

 * OpenRISC Linux

 *

 * Linux architectural port borrowing liberally from similar works of

 * others.  All original copyrights apply as per the original source

 * declaration.

 *

 * OpenRISC implementation:

 * Copyright (C) 2003 Matjaz Breskvar <phoenix@bsemi.com>

 * Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>

 * et al.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#ifndef __ASM_OPENRISC_MEMBLOCK_H

#define __ASM_OPENRISC_MEMBLOCK_H



/* empty */



#endif /* __ASM_OPENRISC_MEMBLOCK_H */

arch/powerpc/include/asm/memblock.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_MEMBLOCK_H

#define _ASM_POWERPC_MEMBLOCK_H



#include <asm/udbg.h>



#define MEMBLOCK_DBG(fmt...) udbg_printf(fmt)



#endif /* _ASM_POWERPC_MEMBLOCK_H */