Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b28eaacf authored Feb 05, 2013 by Olof Johansson

Merge tag 'cleanup-decompwdog-3.9' of...

Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

From Shawn Guo:
The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
are unused on ARM architecure.  Samsung has some code setting up wdog
in arch_decomp_wdog().  But since CONFIG_S3C_BOOT_WATCHDOG is defined
nowhere, it will not run.  Otherwise, system can not boot at all when
wdog is set up but no one pats it.

* tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: samsung: remove unused arch_decomp_wdog() code
  ARM: remove unused arch_decomp_wdog()
  ARM: decompress: remove unused ARCH_HAS_DECOMP_WDOG

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 0a046de1 1ff5f55a

arch/arm/boot/compressed/decompress.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -13,8 +13,6 @@ extern void error(char *);
		#define STATIC static
		#define STATIC_RW_DATA /* non-static please */

		#define ARCH_HAS_DECOMP_WDOG

		/* Diagnostic functions */
		#ifdef DEBUG
		# define Assert(cond,msg) {if(!(cond)) error(msg);}

arch/arm/mach-at91/include/mach/uncompress.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -196,6 +196,4 @@ static inline void flush(void)
		barrier();
		}

		#define arch_decomp_wdog()

		#endif

arch/arm/mach-bcm2835/include/mach/uncompress.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -42,4 +42,3 @@ static inline void flush(void)
		}

		#define arch_decomp_setup()
		#define arch_decomp_wdog()

arch/arm/mach-clps711x/include/mach/uncompress.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -53,5 +53,3 @@ static inline void flush(void)
		* nothing to do
		*/
		#define arch_decomp_setup()

		#define arch_decomp_wdog()

arch/arm/mach-cns3xxx/include/mach/uncompress.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -51,4 +51,3 @@ static inline void flush(void)
		* nothing to do
		*/
		#define arch_decomp_setup()
		#define arch_decomp_wdog()