From 42948d8a53c67745ced1b2391933338b245f9fb0 Mon Sep 17 00:00:00 2001
From: Jon Benson <hastarin@gmail.com>
Date: Sat, 30 Oct 2010 23:29:38 +1100
Subject: [PATCH] Fixed various compiler warnings by updating from ACE kernel
 source.

---
 arch/arm/mach-msm/smem_log.c | 4 ++--
 block/blk-core.c             | 6 ++++--
 fs/partitions/check.c        | 4 ++--
 fs/proc/array.c              | 2 +-
 kernel/power/wakelock.c      | 2 +-
 kernel/sched.c               | 2 +-
 net/ethernet/eth.c           | 6 ------
 7 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/arch/arm/mach-msm/smem_log.c b/arch/arm/mach-msm/smem_log.c
index 22acb9ab..c20d8ddb 100644
--- a/arch/arm/mach-msm/smem_log.c
+++ b/arch/arm/mach-msm/smem_log.c
@@ -947,11 +947,11 @@ static void init_syms(void) {}
 
 static inline unsigned int read_timestamp(void)
 {
-	unsigned int tick;
+	unsigned int tick = 0;
 
 	do {
 		tick = readl(TIMESTAMP_ADDR);
-	} while (tick != (tick = readl(TIMESTAMP_ADDR)));
+	} while (tick != readl(TIMESTAMP_ADDR));
 
 	return tick;
 }
diff --git a/block/blk-core.c b/block/blk-core.c
index c2327503..d0686abb 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1560,6 +1560,9 @@ void submit_bio(int rw, struct bio *bio)
 	 * go through the normal accounting stuff before submission.
 	 */
 	if (bio_has_data(bio)) {
+#if defined(CONFIG_MSM_RMT_STORAGE_SERVER)
+		char bde[BDEVNAME_SIZE];
+#endif
 		if (rw & WRITE) {
 			count_vm_events(PGPGOUT, count);
 		} else {
@@ -1576,9 +1579,8 @@ void submit_bio(int rw, struct bio *bio)
 				bdevname(bio->bi_bdev, b),
 				count);
 		}
-#if CONFIG_MSM_RMT_STORAGE_SERVER
+#if defined(CONFIG_MSM_RMT_STORAGE_SERVER)
 		/* Get process info for the bio of writing radio partition in eMMC boot */
-		char bde[BDEVNAME_SIZE];
 		if (!strcmp(bdevname(bio->bi_bdev, bde), "mmcblk0")) {
 			/* 131072 mean modem_st1 partition*/
 			if (bio->bi_sector < 131072) {
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index fec968dd..8c63fc96 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -327,9 +327,9 @@ static void part_release(struct device *dev)
 	kfree(p);
 }
 
-static int part_uevent(struct device *dev, struct kobj_uvent_env *env)
+static int part_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
-	struct gendisk *disk = dev_to_disk(dev);
+	/*struct gendisk *disk = dev_to_disk(dev);*/ /*Mark unused variable to remove warning message*/
 	struct hd_struct *part = dev_to_part(dev);
 
 	add_uevent_var(env, "PARTN=%u", part->partno);
diff --git a/fs/proc/array.c b/fs/proc/array.c
index de1ddb31..77385c84 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -454,7 +454,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
 
 	seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \
 %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
-%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld %ld\n",
+%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld %lld\n",
 		pid_nr_ns(pid, ns),
 		tcomm,
 		state,
diff --git a/kernel/power/wakelock.c b/kernel/power/wakelock.c
index 530dbcef..6d03db45 100644
--- a/kernel/power/wakelock.c
+++ b/kernel/power/wakelock.c
@@ -267,7 +267,6 @@ static void suspend(struct work_struct *work)
 {
 	int ret;
 	int entry_event_num;
-	unsigned long irqflags;
 
 	pr_info("[R] suspend start\n");
 	if (has_wake_lock(WAKE_LOCK_SUSPEND)) {
@@ -352,6 +351,7 @@ void wake_lock_init(struct wake_lock *lock, int type, const char *name)
 	if (name)
 		lock->name = name;
 	BUG_ON(!lock->name);
+	BUG_ON(lock->flags & WAKE_LOCK_INITIALIZED);
 
 	if (debug_mask & DEBUG_WAKE_LOCK)
 		pr_info("wake_lock_init name=%s\n", lock->name);
diff --git a/kernel/sched.c b/kernel/sched.c
index a7ee0eb5..add23595 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -7060,7 +7060,7 @@ cpumask_var_t nohz_cpu_mask;
  */
 static void update_sysctl(void)
 {
-	unsigned int cpus = min(num_online_cpus(), 8U);
+	unsigned int cpus = min((unsigned int)num_online_cpus(), 8U);
 	unsigned int factor = 1 + ilog2(cpus);
 
 #define SET_SYSCTL(name) \
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 5a883aff..5890b4e1 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -394,9 +394,3 @@ ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len)
 }
 EXPORT_SYMBOL(sysfs_format_mac);
 
-char *print_mac(char *buf, const unsigned char *addr)
-{
-	_format_mac_addr(buf, MAC_BUF_SIZE, addr, ETH_ALEN);
-	return buf;
-}
-EXPORT_SYMBOL(print_mac);