Put the test inside of another test

Author: alex

.github/workflows/kernel-arm64-debug.config

@@ -766,7 +766,6 @@ CONFIG_RUST_EXAMPLE=y
 CONFIG_RUST_EXAMPLE_2=y
 CONFIG_RUST_EXAMPLE_3=m
 CONFIG_RUST_EXAMPLE_4=m
-CONFIG_RUST_EXAMPLE_5=m
 # end of Character devices
 
 # CONFIG_RANDOM_TRUST_BOOTLOADER is not set

.github/workflows/kernel-arm64-release.config

@@ -758,7 +758,6 @@ CONFIG_RUST_EXAMPLE=y
 CONFIG_RUST_EXAMPLE_2=y
 CONFIG_RUST_EXAMPLE_3=m
 CONFIG_RUST_EXAMPLE_4=m
-CONFIG_RUST_EXAMPLE_5=m
 # end of Character devices
 
 # CONFIG_RANDOM_TRUST_BOOTLOADER is not set

.github/workflows/kernel-x86_64-debug.config

@@ -767,7 +767,6 @@ CONFIG_RUST_EXAMPLE=y
 CONFIG_RUST_EXAMPLE_2=y
 CONFIG_RUST_EXAMPLE_3=m
 CONFIG_RUST_EXAMPLE_4=m
-CONFIG_RUST_EXAMPLE_5=m
 # end of Character devices
 
 # CONFIG_RANDOM_TRUST_BOOTLOADER is not set

.github/workflows/kernel-x86_64-release.config

@@ -820,7 +820,6 @@ CONFIG_RUST_EXAMPLE=y
 CONFIG_RUST_EXAMPLE_2=y
 CONFIG_RUST_EXAMPLE_3=m
 CONFIG_RUST_EXAMPLE_4=m
-CONFIG_RUST_EXAMPLE_5=m
 # end of Character devices
 
 # CONFIG_RANDOM_TRUST_CPU is not set

drivers/char/Kconfig

@@ -525,20 +525,6 @@ config RUST_EXAMPLE_4
 
 	  If unsure, say N.
 
-# XXX: Only for GitHub -- do not commit into mainline
-config RUST_EXAMPLE_5
-	depends on RUST
-	tristate "Rust Example 5"
-	default n
-	help
-	  This option builds a fifth example module written in Rust.
-	  It is intended to test several Rust modules at the same time.
-
-	  To compile this as a module, choose M here:
-	  the module will be called rust_example_5.
-
-	  If unsure, say N.
-
 endmenu
 
 config RANDOM_TRUST_CPU

drivers/char/Makefile

@@ -52,4 +52,3 @@ obj-$(CONFIG_RUST_EXAMPLE)	+= rust_example.o
 obj-$(CONFIG_RUST_EXAMPLE_2)	+= rust_example_2.o
 obj-$(CONFIG_RUST_EXAMPLE_3)	+= rust_example_3.o
 obj-$(CONFIG_RUST_EXAMPLE_4)	+= rust_example_4.o
-obj-$(CONFIG_RUST_EXAMPLE_5)	+= rust_example_5.o

drivers/char/rust_example.rs

@@ -7,7 +7,7 @@
 use alloc::boxed::Box;
 use core::pin::Pin;
 use kernel::prelude::*;
-use kernel::{cstr, file_operations::FileOperations, miscdev};
+use kernel::{chrdev, cstr, file_operations::FileOperations, miscdev};
 
 module! {
     type: RustExample,
@@ -47,6 +47,7 @@ impl FileOperations for RustFile {
 
 struct RustExample {
     message: String,
+    _chrdev: Pin<Box<chrdev::Registration<2>>>,
     _dev: Pin<Box<miscdev::Registration>>,
 }
 
@@ -72,9 +73,15 @@ impl KernelModule for RustExample {
         let x: [u64; 1028] = core::hint::black_box([5; 1028]);
         println!("Large array has length: {}", x.len());
 
+        let mut chrdev_reg = chrdev::Registration::new_pinned(
+            cstr!("rust_chrdev"), 0, &THIS_MODULE)?;
+        chrdev_reg.as_mut().register::<RustFile>()?;
+        chrdev_reg.as_mut().register::<RustFile>()?;
+
         Ok(RustExample {
             message: "on the heap!".to_owned(),
             _dev: miscdev::Registration::new_pinned::<RustFile>(cstr!("rust_miscdev"), None)?,
+            _chrdev: chrdev_reg,
         })
     }
 }