|
|
|
@@ -8,17 +8,13 @@ Subject: [PATCH] toolchain: multiple fixes and changes for gcc 5.0.0
|
|
|
|
|
drivers/gpu/msm/Makefile | 3 +++
|
|
|
|
|
drivers/gpu/msm/adreno_ringbuffer.c | 4 ++--
|
|
|
|
|
drivers/gpu/msm/kgsl_iommu.c | 4 ++--
|
|
|
|
|
drivers/media/platform/msm/camera_oppo_v2/isp/Makefile | 3 +++
|
|
|
|
|
drivers/media/platform/msm/camera_oppo_v2/ispif/Makefile | 3 +++
|
|
|
|
|
.../platform/msm/camera_oppo_v2/jpeg_10/msm_jpeg_sync.c | 14 +++++++-------
|
|
|
|
|
drivers/media/video/Makefile | 2 ++
|
|
|
|
|
drivers/mmc/host/Makefile | 2 ++
|
|
|
|
|
drivers/staging/prima/CORE/HDD/src/wlan_hdd_wmm.c | 2 +-
|
|
|
|
|
drivers/staging/prima/Kbuild | 3 +++
|
|
|
|
|
drivers/video/msm/mdss/Makefile | 3 +++
|
|
|
|
|
drivers/video/msm/mdss/mdss_mdp_pp.c | 2 +-
|
|
|
|
|
fs/fat/Makefile | 2 ++
|
|
|
|
|
kernel/Makefile | 2 ++
|
|
|
|
|
mm/Makefile | 2 ++
|
|
|
|
|
mm/rmap.c | 2 +-
|
|
|
|
|
sound/soc/codecs/Makefile | 3 +++
|
|
|
|
@@ -93,95 +89,6 @@ index 1680a679fb0..6a1f62a8a94 100644
|
|
|
|
|
unsigned int *cmds)
|
|
|
|
|
{
|
|
|
|
|
struct kgsl_device *device = mmu->device;
|
|
|
|
|
diff --git a/drivers/media/platform/msm/camera_oppo_v2/isp/Makefile b/drivers/media/platform/msm/camera_oppo_v2/isp/Makefile
|
|
|
|
|
index 819f9defbff..17c2d2e99dd 100644
|
|
|
|
|
--- a/drivers/media/platform/msm/camera_oppo_v2/isp/Makefile
|
|
|
|
|
+++ b/drivers/media/platform/msm/camera_oppo_v2/isp/Makefile
|
|
|
|
|
@@ -1,3 +1,6 @@
|
|
|
|
|
+
|
|
|
|
|
+EXTRA_CFLAGS += -Wno-array-bounds
|
|
|
|
|
+
|
|
|
|
|
ccflags-y += -Idrivers/media/platform/msm/camera_oppo_v2
|
|
|
|
|
ccflags-y += -Idrivers/media/platform/msm/camera_oppo_v2/sensor/io
|
|
|
|
|
obj-$(CONFIG_MSMB_CAMERA) += msm_isp.o msm_buf_mgr.o msm_isp_util.o msm_isp_axi_util.o msm_isp_stats_util.o
|
|
|
|
|
diff --git a/drivers/media/platform/msm/camera_oppo_v2/ispif/Makefile b/drivers/media/platform/msm/camera_oppo_v2/ispif/Makefile
|
|
|
|
|
index ebb884dab8a..9e0440da8aa 100644
|
|
|
|
|
--- a/drivers/media/platform/msm/camera_oppo_v2/ispif/Makefile
|
|
|
|
|
+++ b/drivers/media/platform/msm/camera_oppo_v2/ispif/Makefile
|
|
|
|
|
@@ -1,3 +1,6 @@
|
|
|
|
|
+
|
|
|
|
|
+EXTRA_CFLAGS += -Wno-array-bounds
|
|
|
|
|
+
|
|
|
|
|
ccflags-y += -Idrivers/media/platform/msm/camera_oppo_v2
|
|
|
|
|
ccflags-y += -Idrivers/media/platform/msm/camera_oppo_v2/sensor/io
|
|
|
|
|
obj-$(CONFIG_MSM_CSID) += msm_ispif.o
|
|
|
|
|
diff --git a/drivers/media/platform/msm/camera_oppo_v2/jpeg_10/msm_jpeg_sync.c b/drivers/media/platform/msm/camera_oppo_v2/jpeg_10/msm_jpeg_sync.c
|
|
|
|
|
index 5cc51ffa573..c456cc6557c 100644
|
|
|
|
|
--- a/drivers/media/platform/msm/camera_oppo_v2/jpeg_10/msm_jpeg_sync.c
|
|
|
|
|
+++ b/drivers/media/platform/msm/camera_oppo_v2/jpeg_10/msm_jpeg_sync.c
|
|
|
|
|
@@ -27,7 +27,7 @@
|
|
|
|
|
#define JPEG_DEC_ID 2
|
|
|
|
|
#define UINT32_MAX (0xFFFFFFFFU)
|
|
|
|
|
|
|
|
|
|
-inline void msm_jpeg_q_init(char const *name, struct msm_jpeg_q *q_p)
|
|
|
|
|
+static inline void msm_jpeg_q_init(char const *name, struct msm_jpeg_q *q_p)
|
|
|
|
|
{
|
|
|
|
|
JPEG_DBG("%s:%d] %s\n", __func__, __LINE__, name);
|
|
|
|
|
q_p->name = name;
|
|
|
|
|
@@ -37,7 +37,7 @@ inline void msm_jpeg_q_init(char const *name, struct msm_jpeg_q *q_p)
|
|
|
|
|
q_p->unblck = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-inline void *msm_jpeg_q_out(struct msm_jpeg_q *q_p)
|
|
|
|
|
+static inline void *msm_jpeg_q_out(struct msm_jpeg_q *q_p)
|
|
|
|
|
{
|
|
|
|
|
unsigned long flags;
|
|
|
|
|
struct msm_jpeg_q_entry *q_entry_p = NULL;
|
|
|
|
|
@@ -63,7 +63,7 @@ inline void *msm_jpeg_q_out(struct msm_jpeg_q *q_p)
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-inline int msm_jpeg_q_in(struct msm_jpeg_q *q_p, void *data)
|
|
|
|
|
+static inline int msm_jpeg_q_in(struct msm_jpeg_q *q_p, void *data)
|
|
|
|
|
{
|
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
|
|
@@ -85,7 +85,7 @@ inline int msm_jpeg_q_in(struct msm_jpeg_q *q_p, void *data)
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-inline int msm_jpeg_q_in_buf(struct msm_jpeg_q *q_p,
|
|
|
|
|
+static inline int msm_jpeg_q_in_buf(struct msm_jpeg_q *q_p,
|
|
|
|
|
struct msm_jpeg_core_buf *buf)
|
|
|
|
|
{
|
|
|
|
|
struct msm_jpeg_core_buf *buf_p;
|
|
|
|
|
@@ -103,7 +103,7 @@ inline int msm_jpeg_q_in_buf(struct msm_jpeg_q *q_p,
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-inline int msm_jpeg_q_wait(struct msm_jpeg_q *q_p)
|
|
|
|
|
+static inline int msm_jpeg_q_wait(struct msm_jpeg_q *q_p)
|
|
|
|
|
{
|
|
|
|
|
int tm = MAX_SCHEDULE_TIMEOUT; /* 500ms */
|
|
|
|
|
int rc;
|
|
|
|
|
@@ -146,7 +146,7 @@ inline int msm_jpeg_q_unblock(struct msm_jpeg_q *q_p)
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-inline void msm_jpeg_outbuf_q_cleanup(struct msm_jpeg_device *pgmn_dev,
|
|
|
|
|
+static inline void msm_jpeg_outbuf_q_cleanup(struct msm_jpeg_device *pgmn_dev,
|
|
|
|
|
struct msm_jpeg_q *q_p, int domain_num)
|
|
|
|
|
{
|
|
|
|
|
struct msm_jpeg_core_buf *buf_p;
|
|
|
|
|
@@ -163,7 +163,7 @@ inline void msm_jpeg_outbuf_q_cleanup(struct msm_jpeg_device *pgmn_dev,
|
|
|
|
|
q_p->unblck = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-inline void msm_jpeg_q_cleanup(struct msm_jpeg_q *q_p)
|
|
|
|
|
+static inline void msm_jpeg_q_cleanup(struct msm_jpeg_q *q_p)
|
|
|
|
|
{
|
|
|
|
|
void *data;
|
|
|
|
|
JPEG_DBG("%s:%d] %s\n", __func__, __LINE__, q_p->name);
|
|
|
|
|
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
|
|
|
|
|
index 26f96cad452..750a92dc22d 100644
|
|
|
|
|
--- a/drivers/media/video/Makefile
|
|
|
|
@@ -221,19 +128,6 @@ index 077e8cb2648..c7a661b4c62 100644
|
|
|
|
|
{
|
|
|
|
|
VOS_TRACE(VOS_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
|
|
|
|
|
"%s: Explicit Qos, notifying userspace",
|
|
|
|
|
diff --git a/drivers/staging/prima/Kbuild b/drivers/staging/prima/Kbuild
|
|
|
|
|
index 78ca4ad657a..dee3a6cc679 100644
|
|
|
|
|
--- a/drivers/staging/prima/Kbuild
|
|
|
|
|
+++ b/drivers/staging/prima/Kbuild
|
|
|
|
|
@@ -1,5 +1,8 @@
|
|
|
|
|
# We can build either as part of a standalone Kernel build or part
|
|
|
|
|
# of an Android build. Determine which mechanism is being used
|
|
|
|
|
+
|
|
|
|
|
+EXTRA_CFLAGS += -Wno-discarded-array-qualifiers
|
|
|
|
|
+
|
|
|
|
|
ifeq ($(MODNAME),)
|
|
|
|
|
KERNEL_BUILD := 1
|
|
|
|
|
else
|
|
|
|
|
diff --git a/drivers/video/msm/mdss/Makefile b/drivers/video/msm/mdss/Makefile
|
|
|
|
|
index 568c020a7c4..00bef01e598 100644
|
|
|
|
|
--- a/drivers/video/msm/mdss/Makefile
|
|
|
|
@@ -242,7 +136,7 @@ index 568c020a7c4..00bef01e598 100644
|
|
|
|
|
+
|
|
|
|
|
+EXTRA_CFLAGS += -Wno-array-bounds
|
|
|
|
|
+
|
|
|
|
|
mdss-mdp3-objs = mdp3.o mdp3_dma.o mdp3_ctrl.o dsi_status_v2.o
|
|
|
|
|
mdss-mdp3-objs = mdp3.o mdp3_dma.o mdp3_ctrl.o
|
|
|
|
|
mdss-mdp3-objs += mdp3_ppp.o mdp3_ppp_hwio.o mdp3_ppp_data.o
|
|
|
|
|
obj-$(CONFIG_FB_MSM_MDSS_MDP3) += mdss-mdp3.o
|
|
|
|
|
diff --git a/drivers/video/msm/mdss/mdss_mdp_pp.c b/drivers/video/msm/mdss/mdss_mdp_pp.c
|
|
|
|
@@ -271,19 +165,6 @@ index e06190322c1..a4f39fae7ec 100644
|
|
|
|
|
obj-$(CONFIG_FAT_FS) += fat.o
|
|
|
|
|
obj-$(CONFIG_VFAT_FS) += vfat.o
|
|
|
|
|
obj-$(CONFIG_MSDOS_FS) += msdos.o
|
|
|
|
|
diff --git a/kernel/Makefile b/kernel/Makefile
|
|
|
|
|
index 4c8635ffeda..0e0ee9696bf 100644
|
|
|
|
|
--- a/kernel/Makefile
|
|
|
|
|
+++ b/kernel/Makefile
|
|
|
|
|
@@ -2,6 +2,8 @@
|
|
|
|
|
# Makefile for the linux kernel.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
+EXTRA_CFLAGS += -Wno-array-bounds
|
|
|
|
|
+
|
|
|
|
|
obj-y = fork.o exec_domain.o panic.o printk.o printk_interface.o \
|
|
|
|
|
cpu.o exit.o itimer.o time.o softirq.o resource.o \
|
|
|
|
|
sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \
|
|
|
|
|
diff --git a/mm/Makefile b/mm/Makefile
|
|
|
|
|
index 7dab505a3d3..6dca64e2d07 100644
|
|
|
|
|
--- a/mm/Makefile
|
|
|
|
|
Pablo Castellano