Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5902f76f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: crypto: move compat_qcedev.h"

parents 0c892a4a 4066c76c

drivers/crypto/msm/compat_qcedev.c

+2 −2
Original line number Diff line number Diff line 
/*

 * QTI CE 32-bit compatibility syscall for 64-bit systems

 *

 * Copyright (c) 2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -19,7 +19,7 @@ 
#include <linux/uaccess.h>

#include <linux/qcedev.h>

#include <linux/compat.h>

#include <linux/compat_qcedev.h>

#include "compat_qcedev.h"



static int compat_get_qcedev_pmem_info(

		struct compat_qcedev_pmem_info __user *pmem32,

drivers/crypto/msm/qcedev.c

+1 −3
Original line number Diff line number Diff line
@@ -35,10 +35,8 @@ 
#include "qcedevi.h"

#include "qce.h"



#ifdef CONFIG_COMPAT

#include <linux/compat.h>

#include <linux/compat_qcedev.h>

#endif

#include "compat_qcedev.h"



#define CACHE_LINE_SIZE 32

#define CE_SHA_BLOCK_SIZE SHA256_BLOCK_SIZE

include/uapi/linux/usb/msm_ext_chg.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
 */

struct msm_usb_chg_info {

	uint32_t chg_block_type;

	off_t page_offset;

	__kernel_off_t page_offset;

	size_t length;

};