Fix some more build warnings

Still plenty of build warnings to go. Change-Id: I300fada2929d6383f6c4bcc45dee234adbb89032 Signed-off-by: Bryan Hundven <[email protected]>
dsexton702 · Dec 14, 2011 · 3e46e19 · 3e46e19
1 parent 0534e54
commit 3e46e19
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -43,6 +43,7 @@ modules.builtin
 /System.map
 /Module.markers
 /Module.symvers
+/build
 
 #
 # git files that we don't want to ignore even it they are dot-files

diff --git a/crypto/ace.c b/crypto/ace.c
@@ -576,13 +576,15 @@ static int s5p_ace_aes_engine_start(struct s5p_ace_aes_ctx *sctx,
 	return 0;
 }
 
+#if defined(CONFIG_ACE_SWAES_FOR_SMALLBLOCK)
 static void s5p_ace_aes_engine_wait(struct s5p_ace_aes_ctx *sctx,
 				u8 *out, const u8 *in, u32 len)
 {
 	while (!(s5p_ace_read_sfr(ACE_FC_INTPEND) & ACE_FC_BTDMA))
 		;	/* wait */
 	s5p_ace_write_sfr(ACE_FC_INTPEND, ACE_FC_BTDMA | ACE_FC_BRDMA);
 }
+#endif
 
 #if defined(CONFIG_ACE_AES_SINGLE_BLOCK) || !defined(CONFIG_ACE_BC_ASYNC)
 static int s5p_ace_aes_run_engine(struct s5p_ace_aes_ctx *sctx,
@@ -1946,7 +1948,10 @@ static int __init s5p_ace_probe(struct platform_device *pdev)
 #if defined(CONFIG_ACE_USE_ACP)
 	void __iomem *ace_sss_user_con;
 #endif
-	int i, j, k;
+	int i, k;
+#if defined(CONFIG_ACE_HASH)
+	int j;
+#endif
 	int ret;
 
 	memset(s5p_adt, 0, sizeof(*s5p_adt));

diff --git a/drivers/char/s3c_mem.c b/drivers/char/s3c_mem.c
@@ -288,7 +288,7 @@ int s3c_mem_ioctl(struct inode *inode, struct file *file,
 			if (copy_from_user(&param, (void __user *)arg, sizeof(struct s3c_mem_dma_param)))
 				return -EFAULT;
 
-			dmac_map_area((param.src_addr)&PAGE_MASK, param.size, DMA_FROM_DEVICE);
+			dmac_map_area((void *)((param.src_addr)&PAGE_MASK), param.size, DMA_FROM_DEVICE);
 			//invalidate_kernel_vmap_range((void *)((param.src_addr)&PAGE_MASK), param.size);
 			return  0;
 		}

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
@@ -169,6 +169,7 @@ config ARCH_HAS_ASYNC_TX_FIND_CHANNEL
 config PL330_DMA
 	tristate "DMA API Driver for PL330"
 	select DMA_ENGINE
+	select ARM_AMBA
 	depends on PL330
 	help
 	  Select if your platform has one or more PL330 DMACs.

diff --git a/drivers/gpu/pvr/dbgdrvif.h b/drivers/gpu/pvr/dbgdrvif.h
@@ -311,5 +311,6 @@ typedef struct _DBGKM_SERVICE_TABLE_
 	IMG_UINT32 	(IMG_CALLCONV *pfnWritePersist)			(PDBG_STREAM psStream,IMG_UINT8 *pui8InBuf,IMG_UINT32 ui32InBuffSize,IMG_UINT32 ui32Level);
 } DBGKM_SERVICE_TABLE, *PDBGKM_SERVICE_TABLE;
 
+extern IMG_VOID DBGDrvGetServiceTable(IMG_VOID **fn_table);
 
 #endif
diff --git a/kernel/panic.c b/kernel/panic.c
@@ -46,6 +46,7 @@ EXPORT_SYMBOL(panic_notifier_list);
 long (*panic_blink)(long time);
 EXPORT_SYMBOL(panic_blink);
 
+#ifndef CONFIG_KERNEL_DEBUG_SEC
 static void panic_blink_one_second(void)
 {
 	static long i = 0, end;
@@ -71,6 +72,7 @@ static void panic_blink_one_second(void)
 		mdelay(MSEC_PER_SEC);
 	}
 }
+#endif /* ! CONFIG_KERNEL_DEBUG_SEC */
 
 /**
  *	panic - halt the system
@@ -84,7 +86,9 @@ NORET_TYPE void panic(const char * fmt, ...)
 {
 	static char buf[1024];
 	va_list args;
+#ifndef CONFIG_KERNEL_DEBUG_SEC
 	long i;
+#endif
 
 	/*
 	 * It's possible to come here directly from a panic-assertion and

diff --git a/kernel/sched.c b/kernel/sched.c
@@ -7521,7 +7521,7 @@ void __init sched_init(void)
 	#endif 
 
 	checksum = &(GAFINFO.GAFINFOCheckSum);
-	memory = &GAFINFO;
+	memory = (unsigned char *)&GAFINFO;
 	for (*checksum = 0, address = 0; address < (sizeof(GAFINFO) - sizeof(GAFINFO.GAFINFOCheckSum)); address++) {
 		if ((*checksum) & 0x8000)
 			(*checksum) = (((*checksum) << 1) | 1 ) ^ memory[address];