[ALPS04672712] Revert "CHROMIUM: dm: boot time specification of dm="

This reverts commit 0cc78aab28.

Bug: 129143048
Test: Boot cuttlefish from AOSP

MTK-Commit-Id: 0c16b8c8dad9786b97ef0b27deae1b2f43a81302

Change-Id: I2e849b7246b0fadbdcf298ef427e128968e51180
Signed-off-by: Sandeep Patil <sspatil@android.com>
Signed-off-by: Miles Chen <miles.chen@mediatek.com>
CR-Id: ALPS04672712
Feature: [Module]Kernel Maintenance
This commit is contained in:
Sandeep Patil
2021-01-29 00:44:21 +08:00
committed by Miles Chen
parent 1b7abd2528
commit b19437bb23
7 changed files with 0 additions and 61 deletions

View File

@@ -837,9 +837,6 @@
dis_ucode_ldr [X86] Disable the microcode loader.
dm= [DM] Allows early creation of a device-mapper device.
See Documentation/device-mapper/boot.txt.
dma_debug=off If the kernel is compiled with DMA_API_DEBUG support,
this option disables the debugging code at boot.

View File

@@ -1986,45 +1986,6 @@ void dm_interface_exit(void)
dm_hash_exit();
}
/**
* dm_ioctl_export - Permanently export a mapped device via the ioctl interface
* @md: Pointer to mapped_device
* @name: Buffer (size DM_NAME_LEN) for name
* @uuid: Buffer (size DM_UUID_LEN) for uuid or NULL if not desired
*/
int dm_ioctl_export(struct mapped_device *md, const char *name,
const char *uuid)
{
int r = 0;
struct hash_cell *hc;
if (!md) {
r = -ENXIO;
goto out;
}
/* The name and uuid can only be set once. */
mutex_lock(&dm_hash_cells_mutex);
hc = dm_get_mdptr(md);
mutex_unlock(&dm_hash_cells_mutex);
if (hc) {
DMERR("%s: already exported", dm_device_name(md));
r = -ENXIO;
goto out;
}
r = dm_hash_insert(name, uuid, md);
if (r) {
DMERR("%s: could not bind to '%s'", dm_device_name(md), name);
goto out;
}
/* Let udev know we've changed. */
dm_kobject_uevent(md, KOBJ_CHANGE, dm_get_event_nr(md));
out:
return r;
}
/**
* dm_copy_name_and_uuid - Copy mapped device name & uuid into supplied buffers
* @md: Pointer to mapped_device

View File

@@ -11,7 +11,6 @@
#include <linux/vmalloc.h>
#include <linux/blkdev.h>
#include <linux/namei.h>
#include <linux/mount.h>
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/slab.h>

View File

@@ -430,12 +430,6 @@ void dm_put(struct mapped_device *md);
void dm_set_mdptr(struct mapped_device *md, void *ptr);
void *dm_get_mdptr(struct mapped_device *md);
/*
* Export the device via the ioctl interface (uses mdptr).
*/
int dm_ioctl_export(struct mapped_device *md, const char *name,
const char *uuid);
/*
* A device can still be used while suspended, but I/O is deferred.
*/

View File

@@ -26,7 +26,6 @@ mounts-y := do_mounts.o
mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o
mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o
mounts-$(CONFIG_BLK_DEV_MD) += do_mounts_md.o
mounts-$(CONFIG_BLK_DEV_DM) += do_mounts_dm.o
# dependencies on generated files need to be listed explicitly
$(obj)/version.o: include/generated/compile.h

View File

@@ -565,7 +565,6 @@ void __init prepare_namespace(void)
wait_for_device_probe();
md_run_setup();
dm_run_setup();
if (saved_root_name[0]) {
root_device_name = saved_root_name;

View File

@@ -61,13 +61,3 @@ void md_run_setup(void);
static inline void md_run_setup(void) {}
#endif
#ifdef CONFIG_BLK_DEV_DM
void dm_run_setup(void);
#else
static inline void dm_run_setup(void) {}
#endif