Skip to content

Commit 0a7d3d8

Browse files
Samir Mehtabgcngm
Samir Mehta
authored and
bgcngm
committed
ARM: msm: GCC Version change.
- Changing gcc toolchain to 4.9 version. - Fix linker error of unknown CPU architecture by adding CONFIG_MSM_CORTEX_A7 in the arch options for the GCC. The issue is seen after bump up to gcc-4.9. - Fix section mismatch errors after upgrading gcc to 4.9 version. To fix these errors variables are moved to appropriate sections. Change-Id: I4f6e970f8170225b0b321515f2cb8f2140cb0c03 Signed-off-by: Samir Mehta <samirn@codeaurora.org>
1 parent b8876d6 commit 0a7d3d8

12 files changed

+46
-44
lines changed

‎AndroidKernel.mk

+16-16
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $(KERNEL_OUT):
7070
mkdir -p $(KERNEL_OUT)
7171

7272
$(KERNEL_CONFIG): $(KERNEL_OUT)
73-
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) $(KERNEL_DEFCONFIG)
73+
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) $(KERNEL_DEFCONFIG)
7474

7575
$(KERNEL_OUT)/piggy : $(TARGET_PREBUILT_INT_KERNEL)
7676
$(hide) gunzip -c $(KERNEL_OUT)/arch/arm/boot/compressed/piggy.gzip > $(KERNEL_OUT)/piggy
@@ -84,7 +84,7 @@ ifeq ($(KERNEL_ENABLE_EXFAT), m)
8484
cp -rf vendor/tuxera/exfat/$(KERNEL_EXFAT_PATH) kernel/fs/
8585
mkdir -p $(KERNEL_OUT)/fs/$(KERNEL_EXFAT_PATH)
8686
# Update exFAT module after vmlinux but before modules
87-
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) vmlinux
87+
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) vmlinux
8888
ifeq ($(HTC_DEBUG_FLAG), DEBUG)
8989
ifeq ($(strip $(KERNEL_EXFAT_VERSION)),)
9090
./kernel/update_tuxera.sh -p $(KERNEL_EXFAT_PATH) -t target/htc.d/htc -o $(KERNEL_OUT)
@@ -110,29 +110,29 @@ endif
110110

111111
endif
112112
endif
113-
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME)
114-
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) modules
115-
$(MAKE) -C kernel O=../$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) modules_install
113+
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME)
114+
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) modules
115+
$(MAKE) -C kernel O=../$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) modules_install
116116
ifeq ($(KERNEL_ENABLE_EXFAT), m)
117117
ifeq ($(HTC_DEBUG_FLAG), DEBUG)
118118
# Build exfat modules for DEBUG
119-
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) SUBDIRS=$(BUILD_PATH)/kernel/fs/$(KERNEL_EXFAT_PATH)/objects modules
120-
$(MAKE) -C kernel O=../$(KERNEL_OUT) SUBDIRS=fs/$(KERNEL_EXFAT_PATH)/objects INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) modules_install
119+
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) SUBDIRS=$(BUILD_PATH)/kernel/fs/$(KERNEL_EXFAT_PATH)/objects modules
120+
$(MAKE) -C kernel O=../$(KERNEL_OUT) SUBDIRS=fs/$(KERNEL_EXFAT_PATH)/objects INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) modules_install
121121
cp kernel/fs/$(KERNEL_EXFAT_PATH)/objects/texfat.ko $(KERNEL_MODULES_OUT)/
122122
mkdir -p $(TARGET_OUT)/bin/
123123
cp -rf kernel/fs/$(KERNEL_EXFAT_PATH)/bin/* $(TARGET_OUT)/bin/
124124
else
125125
ifeq ($(TARGET_BUILD_VARIANT), user)
126126
# Build exfat modules for NonDebug-USER
127-
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) SUBDIRS=$(BUILD_PATH)/kernel/fs/$(KERNEL_EXFAT_PATH)/objects-user modules
128-
$(MAKE) -C kernel O=../$(KERNEL_OUT) SUBDIRS=fs/$(KERNEL_EXFAT_PATH)/objects-user INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) modules_install
127+
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) SUBDIRS=$(BUILD_PATH)/kernel/fs/$(KERNEL_EXFAT_PATH)/objects-user modules
128+
$(MAKE) -C kernel O=../$(KERNEL_OUT) SUBDIRS=fs/$(KERNEL_EXFAT_PATH)/objects-user INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) modules_install
129129
cp kernel/fs/$(KERNEL_EXFAT_PATH)/objects-user/texfat.ko $(KERNEL_MODULES_OUT)/
130130
mkdir -p $(TARGET_OUT)/bin/
131131
cp -rf kernel/fs/$(KERNEL_EXFAT_PATH)/bin/* $(TARGET_OUT)/bin/
132132
else
133133
# Build exfat modules for NonDebug-USERDEBUG
134-
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) SUBDIRS=$(BUILD_PATH)/kernel/fs/$(KERNEL_EXFAT_PATH)/objects-userdebug modules
135-
$(MAKE) -C kernel O=../$(KERNEL_OUT) SUBDIRS=fs/$(KERNEL_EXFAT_PATH)/objects-userdebug INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) modules_install
134+
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) SUBDIRS=$(BUILD_PATH)/kernel/fs/$(KERNEL_EXFAT_PATH)/objects-userdebug modules
135+
$(MAKE) -C kernel O=../$(KERNEL_OUT) SUBDIRS=fs/$(KERNEL_EXFAT_PATH)/objects-userdebug INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) modules_install
136136
cp kernel/fs/$(KERNEL_EXFAT_PATH)/objects-userdebug/texfat.ko $(KERNEL_MODULES_OUT)/
137137
mkdir -p $(TARGET_OUT)/bin/
138138
cp -rf kernel/fs/$(KERNEL_EXFAT_PATH)/bin/* $(TARGET_OUT)/bin/
@@ -144,7 +144,7 @@ endif
144144
$(append-dtb)
145145
ifeq ($(MOCANA_FIPS_MODULE), true)
146146
vendor/mocana/scripts/build_dar.sh -s `pwd`/vendor/mocana -k 3.4.10 -K `pwd`/kernel -t `pwd`/$(KERNEL_MODULES_OUT) -z `pwd`/$(KERNEL_OUT)
147-
$(MAKE) -C kernel ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) mrproper
147+
$(MAKE) -C kernel ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) mrproper
148148
endif
149149
ifeq ($(KERNEL_ENABLE_EXFAT), m)
150150
rm kernel/tuxera_update_htc.sh
@@ -153,16 +153,16 @@ ifeq ($(KERNEL_ENABLE_EXFAT), m)
153153
rm -rf kernel/fs/texfat*
154154
endif
155155
$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_CONFIG)
156-
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) headers_install
156+
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) headers_install
157157

158158
kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG)
159-
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) tags
159+
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) tags
160160

161161
kernelconfig: $(KERNEL_OUT) $(KERNEL_CONFIG)
162162
env KCONFIG_NOTIMESTAMP=true \
163-
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) menuconfig
163+
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) menuconfig
164164
env KCONFIG_NOTIMESTAMP=true \
165-
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-eabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) savedefconfig
165+
$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=arm CROSS_COMPILE=arm-linux-androideabi- PRIVATE_RCMS_NAME=$(PRIVATE_RCMS_NAME) savedefconfig
166166
cp $(KERNEL_OUT)/defconfig kernel/arch/arm/configs/$(KERNEL_DEFCONFIG)
167167

168168
endif

‎arch/arm/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ arch-$(CONFIG_CPU_32v3) :=-D__LINUX_ARM_ARCH__=3 -march=armv3
8080
# doesn't even support -march=armv7-a, since in that situation we would have
8181
# bigger problems.
8282
arch-$(CONFIG_ARCH_MSM_KRAIT) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-mcpu=cortex-a15,-march=armv7-a)
83+
arch-$(CONFIG_MSM_CORTEX_A7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-mcpu=cortex-a15,-march=armv7-a)
8384

8485
# This selects how we optimise for the processor.
8586
tune-$(CONFIG_CPU_ARM610) :=-mtune=arm610

‎arch/arm/mach-msm/board-8974-gpiomux.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static struct msm_gpiomux_config mdm_configs[] __initdata = {
132132
},
133133
};
134134

135-
static struct gpiomux_setting gpio_uart_config = {
135+
static struct gpiomux_setting gpio_uart_config __initdata = {
136136
.func = GPIOMUX_FUNC_2,
137137
.drv = GPIOMUX_DRV_16MA,
138138
.pull = GPIOMUX_PULL_NONE,

‎arch/arm/mach-msm/gdsc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ static struct regulator_ops gdsc_ops = {
147147

148148
static int __devinit gdsc_probe(struct platform_device *pdev)
149149
{
150-
static atomic_t gdsc_count = ATOMIC_INIT(-1);
150+
static atomic_t gdsc_count __initdata = ATOMIC_INIT(-1);
151151
struct regulator_init_data *init_data;
152152
struct resource *res;
153153
struct gdsc *sc;
@@ -275,7 +275,7 @@ static int __devexit gdsc_remove(struct platform_device *pdev)
275275
return 0;
276276
}
277277

278-
static struct of_device_id gdsc_match_table[] = {
278+
static struct of_device_id gdsc_match_table[] __initdata = {
279279
{ .compatible = "qcom,gdsc" },
280280
{}
281281
};

‎arch/arm/mach-msm/krait-regulator-pmic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ enum {
8989

9090
static struct krait_vreg_pmic_chip *the_chip;
9191

92-
static struct of_device_id krait_vreg_pmic_match_table[] = {
92+
static struct of_device_id krait_vreg_pmic_match_table[] __initdata = {
9393
{ .compatible = KRAIT_REG_PMIC_DEV_NAME },
9494
{}
9595
};

‎arch/arm/mach-msm/krait-regulator.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ static int __devexit krait_power_remove(struct platform_device *pdev)
14051405
return 0;
14061406
}
14071407

1408-
static struct of_device_id krait_power_match_table[] = {
1408+
static struct of_device_id krait_power_match_table[] __initdata = {
14091409
{ .compatible = "qcom,krait-regulator", },
14101410
{}
14111411
};
@@ -1420,7 +1420,7 @@ static struct platform_driver krait_power_driver = {
14201420
},
14211421
};
14221422

1423-
static struct of_device_id krait_pdn_match_table[] = {
1423+
static struct of_device_id krait_pdn_match_table[] __initdata = {
14241424
{ .compatible = "qcom,krait-pdn", },
14251425
{}
14261426
};

‎arch/arm/mach-msm/lpm_levels.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static struct notifier_block __refdata lpm_cpu_nblk = {
9999
};
100100

101101
static uint32_t allowed_l2_mode;
102-
static uint32_t sysfs_dbg_l2_mode = MSM_SPM_L2_MODE_POWER_COLLAPSE;
102+
static uint32_t sysfs_dbg_l2_mode __refdata = MSM_SPM_L2_MODE_POWER_COLLAPSE;
103103
static uint32_t default_l2_mode;
104104

105105

@@ -1082,7 +1082,7 @@ static int lpm_probe(struct platform_device *pdev)
10821082
return -EFAULT;
10831083
}
10841084

1085-
static struct of_device_id cpu_modes_mtch_tbl[] = {
1085+
static struct of_device_id cpu_modes_mtch_tbl[] __initdata = {
10861086
{.compatible = "qcom,cpu-modes"},
10871087
{},
10881088
};
@@ -1096,7 +1096,7 @@ static struct platform_driver cpu_modes_driver = {
10961096
},
10971097
};
10981098

1099-
static struct of_device_id system_modes_mtch_tbl[] = {
1099+
static struct of_device_id system_modes_mtch_tbl[] __initdata = {
11001100
{.compatible = "qcom,system-modes"},
11011101
{},
11021102
};
@@ -1110,7 +1110,7 @@ static struct platform_driver system_modes_driver = {
11101110
},
11111111
};
11121112

1113-
static struct of_device_id lpm_levels_match_table[] = {
1113+
static struct of_device_id lpm_levels_match_table[] __initdata = {
11141114
{.compatible = "qcom,lpm-levels"},
11151115
{},
11161116
};

‎arch/arm/mach-msm/mpm-of.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ enum mpm_reg_offsets {
9898
MSM_MPM_REG_STATUS,
9999
};
100100

101-
static DEFINE_SPINLOCK(msm_mpm_lock);
101+
static __refdata DEFINE_SPINLOCK(msm_mpm_lock);
102102

103103
static uint32_t msm_mpm_enabled_irq[MSM_MPM_REG_WIDTH];
104104
static uint32_t msm_mpm_wake_irq[MSM_MPM_REG_WIDTH];
@@ -113,7 +113,7 @@ enum {
113113
MSM_MPM_DEBUG_NON_DETECTABLE_IRQ_IDLE = BIT(3),
114114
};
115115

116-
static int msm_mpm_debug_mask = 1;
116+
static int msm_mpm_debug_mask __refdata = 1;
117117
module_param_named(
118118
debug_mask, msm_mpm_debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP
119119
);
@@ -721,12 +721,12 @@ static int __devinit msm_mpm_dev_probe(struct platform_device *pdev)
721721
return 0;
722722
}
723723

724-
static inline int __init mpm_irq_domain_linear_size(struct irq_domain *d)
724+
static inline int mpm_irq_domain_linear_size(struct irq_domain *d)
725725
{
726726
return d->revmap_data.linear.size;
727727
}
728728

729-
static inline int __init mpm_irq_domain_legacy_size(struct irq_domain *d)
729+
static inline int mpm_irq_domain_legacy_size(struct irq_domain *d)
730730
{
731731
return d->revmap_data.legacy.size;
732732
}

‎arch/arm/mach-msm/msm-pm.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ enum msm_pc_count_offsets {
9797
};
9898

9999
#ifdef CONFIG_HTC_POWER_DEBUG
100-
static int msm_pm_debug_mask = MSM_PM_DEBUG_SUSPEND | MSM_PM_DEBUG_RPM_STAT | MSM_PM_DEBUG_CLOCK;
100+
static int msm_pm_debug_mask __refdata = MSM_PM_DEBUG_SUSPEND | MSM_PM_DEBUG_RPM_STAT | MSM_PM_DEBUG_CLOCK;
101101
#else
102-
static int msm_pm_debug_mask = 1;
102+
static int msm_pm_debug_mask __refdata = 1;
103103
#endif
104104
module_param_named(
105105
debug_mask, msm_pm_debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP
@@ -136,14 +136,14 @@ static char *msm_pm_sleep_mode_labels[MSM_PM_SLEEP_MODE_NR] = {
136136
"standalone_power_collapse",
137137
};
138138

139-
static bool msm_pm_ldo_retention_enabled = true;
139+
static bool msm_pm_ldo_retention_enabled __refdata = true;
140140
static bool msm_no_ramp_down_pc;
141141
static struct msm_pm_sleep_status_data *msm_pm_slp_sts;
142142
DEFINE_PER_CPU(struct clk *, cpu_clks);
143143
static struct clk *l2_clk;
144144

145145
static int cpu_count;
146-
static DEFINE_SPINLOCK(cpu_cnt_lock);
146+
static __refdata DEFINE_SPINLOCK(cpu_cnt_lock);
147147
#define SCM_HANDOFF_LOCK_ID "S:7"
148148
static bool need_scm_handoff_lock;
149149
static remote_spinlock_t scm_handoff_lock;
@@ -153,7 +153,7 @@ static void (*msm_pm_enable_l2_fn)(void);
153153
static void (*msm_pm_flush_l2_fn)(void);
154154
static void __iomem *msm_pc_debug_counters;
155155

156-
static enum msm_pm_l2_scm_flag msm_pm_flush_l2_flag = MSM_SCM_L2_OFF;
156+
static enum msm_pm_l2_scm_flag msm_pm_flush_l2_flag __refdata = MSM_SCM_L2_OFF;
157157

158158
void msm_pm_set_l2_flush_flag(enum msm_pm_l2_scm_flag flag)
159159
{
@@ -167,7 +167,7 @@ static enum msm_pm_l2_scm_flag msm_pm_get_l2_flush_flag(void)
167167
}
168168

169169
static cpumask_t retention_cpus;
170-
static DEFINE_SPINLOCK(retention_lock);
170+
static __refdata DEFINE_SPINLOCK(retention_lock);
171171

172172
static int msm_pm_get_pc_mode(struct device_node *node,
173173
const char *key, uint32_t *pc_mode_val)
@@ -1195,7 +1195,7 @@ static int msm_cpu_status_probe(struct platform_device *pdev)
11951195
return 0;
11961196
};
11971197

1198-
static struct of_device_id msm_slp_sts_match_tbl[] = {
1198+
static struct of_device_id msm_slp_sts_match_tbl[] __initdata= {
11991199
{.compatible = "qcom,cpu-sleep-status"},
12001200
{},
12011201
};
@@ -1209,7 +1209,7 @@ static struct platform_driver msm_cpu_status_driver = {
12091209
},
12101210
};
12111211

1212-
static struct of_device_id msm_snoc_clnt_match_tbl[] = {
1212+
static struct of_device_id msm_snoc_clnt_match_tbl[] __initdata = {
12131213
{.compatible = "qcom,pm-snoc-client"},
12141214
{},
12151215
};
@@ -1480,7 +1480,7 @@ static int msm_cpu_pm_probe(struct platform_device *pdev)
14801480
return ret;
14811481
}
14821482

1483-
static struct of_device_id msm_cpu_pm_table[] = {
1483+
static struct of_device_id msm_cpu_pm_table[] __initdata = {
14841484
{.compatible = "qcom,pm-8x60"},
14851485
{},
14861486
};

‎arch/arm/mach-msm/pm-data.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include "pm.h"
1515

16-
struct msm_pm_platform_data msm_pm_sleep_modes[] = {
16+
struct msm_pm_platform_data msm_pm_sleep_modes[] __refdata = {
1717
[MSM_PM_MODE(0, MSM_PM_SLEEP_MODE_POWER_COLLAPSE)] = {
1818
.idle_supported = 1,
1919
.suspend_supported = 1,

‎arch/arm/mach-msm/rpm-smd.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ struct msm_rpm_driver_data {
7373
#define MAX_ERR_BUFFER_SIZE 128
7474
#define INIT_ERROR 1
7575

76-
static ATOMIC_NOTIFIER_HEAD(msm_rpm_sleep_notifier);
76+
static __refdata ATOMIC_NOTIFIER_HEAD(msm_rpm_sleep_notifier);
7777
static bool standalone;
7878

7979
int msm_rpm_register_notifier(struct notifier_block *nb)
@@ -313,7 +313,7 @@ static void tr_update(struct slp_buf *s, char *buf)
313313
int msm_rpm_smd_buffer_request(char *buf, uint32_t size, gfp_t flag)
314314
{
315315
struct slp_buf *slp;
316-
static DEFINE_SPINLOCK(slp_buffer_lock);
316+
static __refdata DEFINE_SPINLOCK(slp_buffer_lock);
317317
unsigned long flags;
318318

319319
if (size > MAX_SLEEP_BUFFER)
@@ -442,7 +442,7 @@ struct msm_rpm_wait_data {
442442
int errno;
443443
struct completion ack;
444444
};
445-
DEFINE_SPINLOCK(msm_rpm_list_lock);
445+
__refdata DEFINE_SPINLOCK(msm_rpm_list_lock);
446446

447447
struct msm_rpm_ack_msg {
448448
uint32_t req;
@@ -1401,7 +1401,7 @@ static int __devinit msm_rpm_dev_probe(struct platform_device *pdev)
14011401
return -EINVAL;
14021402
}
14031403

1404-
static struct of_device_id msm_rpm_match_table[] = {
1404+
static struct of_device_id msm_rpm_match_table[] __initdata = {
14051405
{.compatible = "qcom,rpm-smd"},
14061406
{},
14071407
};

‎scripts/gcc-wrapper.py

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
allowed_warnings = set([
4343
"return_address.c:62",
44+
"ene_ub6250.c:2118",
4445
])
4546

4647
# Capture the name of the object file, can find it.

0 commit comments

Comments
 (0)