[5.4,09/38] mmc: fix compilation of user API

Message ID	20200605140253.121452688@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=taFX=7S=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= <jerome.pouiller@silabs.com>, Ulf Hansson <ulf.hansson@linaro.org> Subject: [PATCH 5.4 09/38] mmc: fix compilation of user API Date: Fri, 5 Jun 2020 16:14:52 +0200 Message-Id: <20200605140253.121452688@linuxfoundation.org> In-Reply-To: <20200605140252.542768750@linuxfoundation.org> References: <20200605140252.542768750@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.4,04/38] HID: multitouch: enable multi-input as a quirk for some devices [5.4,05/38] HID: i2c-hid: add Schneider SCL142ALM to descriptor override [5.4,09/38] mmc: fix compilation of user API [5.4,12/38] scsi: ufs: Release clock if DMA map fails [5.4,13/38] net: dsa: mt7530: set CPU port to fallback mode [5.4,15/38] drm/i915: fix port checks for MST support on gen >= 11 [5.4,16/38] scsi: hisi_sas: Check sas_port before using it [5.4,18/38] powerpc/xmon: Restrict when kernel is locked down [5.4,21/38] s390/ftrace: save traced function caller [5.4,23/38] RDMA/qedr: Fix synchronization methods and memory leaks in qedr [5.4,24/38] ARC: Fix ICCM & DCCM runtime size checks [5.4,27/38] scsi: pm: Balance pm_only counter of request queue during system resume [5.4,29/38] io_uring: initialize ctx->sqo_wait earlier [5.4,30/38] x86/mmiotrace: Use cpumask_available() for cpumask_var_t variables [5.4,31/38] net: bmac: Fix read of MAC address from ROM [5.4,33/38] s390/mm: fix set_huge_pte_at() for empty ptes [5.4,35/38] net/ethernet/freescale: rework quiesce/activate for ucc_geth [5.4,38/38] net: smsc911x: Fix runtime PM imbalance on error

Message ID

20200605140253.121452688@linuxfoundation.org

State

Superseded

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, 
	=?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= <jerome.pouiller@silabs.com>,
	Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH 5.4 09/38] mmc: fix compilation of user API
Date: Fri,  5 Jun 2020 16:14:52 +0200
Message-Id: <20200605140253.121452688@linuxfoundation.org>
In-Reply-To: <20200605140252.542768750@linuxfoundation.org>
References: <20200605140252.542768750@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Greg KH June 5, 2020, 2:14 p.m. UTC

From: Jérôme Pouiller <jerome.pouiller@silabs.com>

commit 83fc5dd57f86c3ec7d6d22565a6ff6c948853b64 upstream.

The definitions of MMC_IOC_CMD  and of MMC_IOC_MULTI_CMD rely on
MMC_BLOCK_MAJOR:

    #define MMC_IOC_CMD       _IOWR(MMC_BLOCK_MAJOR, 0, struct mmc_ioc_cmd)
    #define MMC_IOC_MULTI_CMD _IOWR(MMC_BLOCK_MAJOR, 1, struct mmc_ioc_multi_cmd)

However, MMC_BLOCK_MAJOR is defined in linux/major.h and
linux/mmc/ioctl.h did not include it.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200511161902.191405-1-Jerome.Pouiller@silabs.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 include/uapi/linux/mmc/ioctl.h |    1 +
 1 file changed, 1 insertion(+)

--- a/include/uapi/linux/mmc/ioctl.h
+++ b/include/uapi/linux/mmc/ioctl.h
@@ -3,6 +3,7 @@ 
 #define LINUX_MMC_IOCTL_H
 
 #include <linux/types.h>
+#include <linux/major.h>
 
 struct mmc_ioc_cmd {
 	/*

[5.4,09/38] mmc: fix compilation of user API

Commit Message

Patch