diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-02-12 09:02:59 +0800 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-02-12 09:02:59 +0800 |
| commit | 8e9952003a453ef5dd6aeff1211826218bfe3f85 (patch) | |
| tree | 9463d9b11f513970d95dd998b7119a2f6344c367 | |
| parent | bcadc74444a0afe65190d403e2005d3f89f8c002 (diff) | |
| parent | 0230b1cf0465816febf30f076e2b4043c98df2db (diff) | |
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingtracking-llct-ll-20150216.0tracking-llct-ll-20150212.1tracking-llct-ll-20150212.0llct-20150212.0
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | drivers/of/fdt.c | 10 | ||||
| -rw-r--r-- | tools/perf/Makefile.perf | 4 |
3 files changed, 12 insertions, 4 deletions
@@ -658,6 +658,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_REGULAR ifeq ($(call cc-option, $(stackp-flag)),) $(warning Cannot use CONFIG_CC_STACKPROTECTOR_REGULAR: \ -fstack-protector not supported by compiler) + stackp-flag := endif else ifdef CONFIG_CC_STACKPROTECTOR_STRONG @@ -665,6 +666,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_STRONG ifeq ($(call cc-option, $(stackp-flag)),) $(warning Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: \ -fstack-protector-strong not supported by compiler) + stackp-flag := endif else # Force off for distro compilers that enable stack protector by default. diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 510074226d57..15cccddede04 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -28,6 +28,12 @@ #include <asm/setup.h> /* for COMMAND_LINE_SIZE */ #include <asm/page.h> +#ifdef CONFIG_ARM64 +#define fdt_crc_size_hack(_s) min(fdt_totalsize(_s),(unsigned)0x200000) +#else +#define fdt_crc_size_hack(_s) fdt_totalsize(_s) +#endif + /* * of_fdt_limit_memory - limit the number of regions in the /memory node * @limit: maximum entries @@ -1018,7 +1024,7 @@ bool __init early_init_dt_verify(void *params) /* Setup flat device-tree pointer */ initial_boot_params = params; of_fdt_crc32 = crc32_be(~0, initial_boot_params, - fdt_totalsize(initial_boot_params)); + fdt_crc_size_hack(initial_boot_params)); return true; } @@ -1114,7 +1120,7 @@ static int __init of_fdt_raw_init(void) return 0; if (of_fdt_crc32 != crc32_be(~0, initial_boot_params, - fdt_totalsize(initial_boot_params))) { + fdt_crc_size_hack(initial_boot_params))) { pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n"); return 0; } diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index aa6a50447c32..4f7a8572094a 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -825,13 +825,13 @@ LIBAPIKFS_SOURCES = $(wildcard $(LIB_PATH)fs/*.[ch] $(LIB_PATH)fd/*.[ch]) # already $(LIBAPIKFS): $(LIBAPIKFS_SOURCES) ifeq ($(subdir),) - $(QUIET_SUBDIR0)$(LIB_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) libapikfs.a + $(QUIET_SUBDIR0)$(LIB_DIR) $(QUIET_SUBDIR1) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) libapikfs.a endif $(LIBAPIKFS)-clean: ifeq ($(subdir),) $(call QUIET_CLEAN, libapikfs) - @$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null + @$(MAKE) -C $(LIB_DIR) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) clean >/dev/null endif help: |