From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [merged] usb-fix-serial-build-when-sysrq-is-disabled.patch removed from -mm tree Date: Tue, 27 Apr 2010 11:02:10 -0400 Message-ID: <201004271803.o3RI3hPB011007@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:54497 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756501Ab0D0SEd (ORCPT ); Tue, 27 Apr 2010 14:04:33 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: randy.dunlap@oracle.com, greg@kroah.com, mm-commits@vger.kernel.org The patch titled usb: fix serial build when SYSRQ is disabled has been removed from the -mm tree. Its filename was usb-fix-serial-build-when-sysrq-is-disabled.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: usb: fix serial build when SYSRQ is disabled From: Randy Dunlap Fix build error when CONFIG_MAGIC_SYSRQ is not enabled: drivers/usb/serial/generic.c:566: error: implicit declaration of function 'handle_sysrq' Signed-off-by: Randy Dunlap Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/usb/serial/generic.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff -puN drivers/usb/serial/generic.c~usb-fix-serial-build-when-sysrq-is-disabled drivers/usb/serial/generic.c --- a/drivers/usb/serial/generic.c~usb-fix-serial-build-when-sysrq-is-disabled +++ a/drivers/usb/serial/generic.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -558,6 +559,7 @@ void usb_serial_generic_unthrottle(struc } } +#ifdef CONFIG_MAGIC_SYSRQ int usb_serial_handle_sysrq_char(struct tty_struct *tty, struct usb_serial_port *port, unsigned int ch) { @@ -571,6 +573,13 @@ int usb_serial_handle_sysrq_char(struct } return 0; } +#else +int usb_serial_handle_sysrq_char(struct tty_struct *tty, + struct usb_serial_port *port, unsigned int ch) +{ + return 0; +} +#endif EXPORT_SYMBOL_GPL(usb_serial_handle_sysrq_char); int usb_serial_handle_break(struct usb_serial_port *port) _ Patches currently in -mm which might be from randy.dunlap@oracle.com are origin.patch linux-next.patch dib3000mc-reduce-large-stack-usage.patch dib7000p-reduce-large-stack-usage.patch led-driver-for-the-soekris-net5501-board-fix-2.patch leds-route-kbd-leds-through-the-generic-leds-layer-leds-input-depends-on-input.patch scsi-fix-convert-scsi_scanc-kernel-doc.patch scsi-update-drivers-tools-url-references.patch laptop-mode-make-flushes-per-device-fix.patch mmcompaction-add-a-tunable-that-decides-when-memory-should-be-compacted-and-when-it-should-be-reclaimed.patch lib-hexdumpc-reduce-stack-variable-size-and-cleanups.patch xen-fix-build-when-sysrq-is-disabled.patch documentation-submittingdrivers-resources.patch memcg-move-charge-of-file-pages-fix-2.patch memcg-update-documentation-v8.patch numa-update-documentation-vm-numa-add-memoryless-node-info.patch reiser4-export-remove_from_page_cache-fix.patch mutex-subsystem-synchro-test-module-add-missing-header-file.patch