svn commit: r348280 - in stable/12/sys: compat/linuxkpi/common/include/linux modules/linuxkpi

[Johannes Lundberg]

Author: johalun
Date: Sat May 25 20:53:23 2019
New Revision: 348280
URL: https://svnweb.freebsd.org/changeset/base/348280

Log:
  LinuxKPI: Revert MFC of r347892
  
  Revert until we can figure out how to keep compatibility with drm-kmod
  ports between 12.0 and 12-STABLE/12.1.

Modified:
  stable/12/sys/compat/linuxkpi/common/include/linux/seq_file.h
  stable/12/sys/modules/linuxkpi/Makefile
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/linuxkpi/common/include/linux/seq_file.h
==============================================================================
--- stable/12/sys/compat/linuxkpi/common/include/linux/seq_file.h	Sat May 25 20:24:51 2019	(r348279)
+++ stable/12/sys/compat/linuxkpi/common/include/linux/seq_file.h	Sat May 25 20:53:23 2019	(r348280)
@@ -30,29 +30,13 @@
 #ifndef _LINUX_SEQ_FILE_H_
 #define _LINUX_SEQ_FILE_H_
 
-#include <linux/types.h>
-#include <linux/fs.h>
 #include <sys/sbuf.h>
 
-#undef file
-#define inode vnode
-
-#define	DEFINE_SHOW_ATTRIBUTE(__name)					\
-static int __name ## _open(struct inode *inode, struct linux_file *file)	\
-{									\
-	return single_open(file, __name ## _show, inode->i_private);	\
-}									\
-									\
-static const struct file_operations __name ## _fops = {			\
-	.owner		= THIS_MODULE,					\
-	.open		= __name ## _open,				\
-	.read		= seq_read,					\
-	.llseek		= seq_lseek,					\
-	.release	= single_release,				\
-}
-
 struct seq_operations;
+struct linux_file;
 
+#define inode vnode
+
 struct seq_file {
 	struct sbuf	*buf;
 
@@ -83,6 +67,5 @@ int single_release(struct inode *, struct linux_file *
 #define seq_puts(m, str)	sbuf_printf((m)->buf, str)
 #define seq_putc(m, str)	sbuf_putc((m)->buf, str)
 
-#define	file			linux_file
 
 #endif	/* _LINUX_SEQ_FILE_H_ */

Modified: stable/12/sys/modules/linuxkpi/Makefile
==============================================================================
--- stable/12/sys/modules/linuxkpi/Makefile	Sat May 25 20:24:51 2019	(r348279)
+++ stable/12/sys/modules/linuxkpi/Makefile	Sat May 25 20:53:23 2019	(r348280)
@@ -13,7 +13,6 @@ SRCS=	linux_compat.c \
 	linux_pci.c \
 	linux_radix.c \
 	linux_rcu.c \
-	linux_seq_file.c \
 	linux_schedule.c \
 	linux_slab.c \
 	linux_tasklet.c \