- blackfin-serial-driver-fix-building-when-debug-is-enabled-but-serial-console-is-disabled.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     blackfin serial driver: fix building when debug is enabled but serial console is disabled
has been removed from the -mm tree.  Its filename was
     blackfin-serial-driver-fix-building-when-debug-is-enabled-but-serial-console-is-disabled.patch

This patch was dropped because someone merged some of these and fiddled with them - I lost the plot

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: blackfin serial driver: fix building when debug is enabled but serial console is disabled
From: Mike Frysinger <vapier.adi@xxxxxxxxx>

Signed-off-by: Mike Frysinger <vapier.adi@xxxxxxxxx>
Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/serial/bfin_5xx.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN drivers/serial/bfin_5xx.c~blackfin-serial-driver-fix-building-when-debug-is-enabled-but-serial-console-is-disabled drivers/serial/bfin_5xx.c
--- a/drivers/serial/bfin_5xx.c~blackfin-serial-driver-fix-building-when-debug-is-enabled-but-serial-console-is-disabled
+++ a/drivers/serial/bfin_5xx.c
@@ -1256,8 +1256,10 @@ void bfin_serial_debug(const char *fmt, 
 	char buf[128];
 	va_list ap;
 
+#ifdef CONFIG_SERIAL_BFIN_CONSOLE
 	if (bfin_serial_console.index < 0)
 		return;		/* Too early. */
+#endif
 
 	va_start(ap, fmt);
 	vsprintf(buf, fmt, ap);
_

Patches currently in -mm which might be from vapier.adi@xxxxxxxxx are

origin.patch
linux-next.patch
blackfin-serial-driver-fix-building-when-debug-is-enabled-but-serial-console-is-disabled.patch
blackfin-serial-driver-use-the-dlab-macro-to-hide-variant-differences.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux