linux-kernel - linux-next: manual merge of the devicetree tree with the arm-soc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20140312220350.3c35bce7dff139a73a9c8262@kernel.org>
Date:	Wed, 12 Mar 2014 22:03:50 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Grant Likely <grant.likely@...retlab.ca>,
	Marek Szyprowski <m.szyprowski@...sung.com>,
	Stephen Boyd <sboyd@...eaurora.org>,
	Arnd Bergmann <arnd@...db.de>, Olof Johansson <olof@...om.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the devicetree tree with the arm-soc
 tree

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in include/asm-generic/vmlinux.lds.h between commit 6c3ff8b11a16ec69 ("ARM: Introduce CPU_METHOD_OF_DECLARE() for cpu hotplug/smp") from the  tree and commit f618c4703a14672d27 ("drivers: of: add support for custom reserved memory drivers") from the devicetree tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc include/asm-generic/vmlinux.lds.h
index bd02ca7a1d55,f10f64fcc815..000000000000
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -167,15 -167,16 +167,25 @@@
  #define CLK_OF_TABLES()
  #endif
  
 +#ifdef CONFIG_SMP
 +#define CPU_METHOD_OF_TABLES() . = ALIGN(8);                              \
 +                         VMLINUX_SYMBOL(__cpu_method_of_table_begin) = .; \
 +                         *(__cpu_method_of_table)                         \
 +                         VMLINUX_SYMBOL(__cpu_method_of_table_end) = .;
 +#else
 +#define CPU_METHOD_OF_TABLES()
 +#endif
 +
+ #ifdef CONFIG_OF_RESERVED_MEM
+ #define RESERVEDMEM_OF_TABLES()                               \
+       . = ALIGN(8);                                   \
+       VMLINUX_SYMBOL(__reservedmem_of_table) = .;     \
+       *(__reservedmem_of_table)                       \
+       *(__reservedmem_of_table_end)
+ #else
+ #define RESERVEDMEM_OF_TABLES()
+ #endif
+ 
  #define KERNEL_DTB()                                                  \
        STRUCT_ALIGN();                                                 \
        VMLINUX_SYMBOL(__dtb_start) = .;                                \
@@@ -499,8 -500,8 +509,9 @@@
        TRACE_SYSCALLS()                                                \
        MEM_DISCARD(init.rodata)                                        \
        CLK_OF_TABLES()                                                 \
+       RESERVEDMEM_OF_TABLES()                                         \
        CLKSRC_OF_TABLES()                                              \
 +      CPU_METHOD_OF_TABLES()                                          \
        KERNEL_DTB()                                                    \
        IRQCHIP_OF_MATCH_TABLE()
  

Content of type "application/pgp-signature" skipped