Commit fa4fe8ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'uml-for-linus-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux 

Pull UML fix from Richard Weinberger:

 - Fix modular build for UML watchdog

* tag 'uml-for-linus-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
  um: harddog: fix modular build
parents a35747c3 73a23d77

arch/um/drivers/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ mconsole-objs := mconsole_kern.o mconsole_user.o 
hostaudio-objs := hostaudio_kern.o

ubd-objs := ubd_kern.o ubd_user.o

port-objs := port_kern.o port_user.o

harddog-objs := harddog_kern.o harddog_user.o

harddog-objs := harddog_kern.o

harddog-builtin-$(CONFIG_UML_WATCHDOG) := harddog_user.o harddog_user_exp.o

rtc-objs := rtc_kern.o rtc_user.o



LDFLAGS_pcap.o = $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libpcap.a)
@@ -60,6 +61,7 @@ obj-$(CONFIG_PTY_CHAN) += pty.o 
obj-$(CONFIG_TTY_CHAN) += tty.o 

obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o

obj-$(CONFIG_UML_WATCHDOG) += harddog.o

obj-y += $(harddog-builtin-y) $(harddog-builtin-m)

obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o

obj-$(CONFIG_UML_RANDOM) += random.o

obj-$(CONFIG_VIRTIO_UML) += virtio_uml.o

arch/um/drivers/harddog.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef UM_WATCHDOG_H

#define UM_WATCHDOG_H



int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock);

void stop_watchdog(int in_fd, int out_fd);

int ping_watchdog(int fd);



#endif /* UM_WATCHDOG_H */

arch/um/drivers/harddog_kern.c

+1 −6
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <linux/spinlock.h>

#include <linux/uaccess.h>

#include "mconsole.h"

#include "harddog.h"



MODULE_LICENSE("GPL");
@@ -60,8 +61,6 @@ static int harddog_out_fd = -1; 
 *	Allow only one person to hold it open

 */



extern int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock);



static int harddog_open(struct inode *inode, struct file *file)

{

	int err = -EBUSY;
@@ -92,8 +91,6 @@ static int harddog_open(struct inode *inode, struct file *file) 
	return err;

}



extern void stop_watchdog(int in_fd, int out_fd);



static int harddog_release(struct inode *inode, struct file *file)

{

	/*
@@ -112,8 +109,6 @@ static int harddog_release(struct inode *inode, struct file *file) 
	return 0;

}



extern int ping_watchdog(int fd);



static ssize_t harddog_write(struct file *file, const char __user *data, size_t len,

			     loff_t *ppos)

{

arch/um/drivers/harddog_user.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <unistd.h>

#include <errno.h>

#include <os.h>

#include "harddog.h"



struct dog_data {

	int stdin_fd;

arch/um/drivers/harddog_user_exp.c

0 → 100644
+9 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/export.h>

#include "harddog.h"



#if IS_MODULE(CONFIG_UML_WATCHDOG)

EXPORT_SYMBOL(start_watchdog);

EXPORT_SYMBOL(stop_watchdog);

EXPORT_SYMBOL(ping_watchdog);

#endif