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

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

Merge "msm: smem: Rename smem_alloc2_to_proc() to smem_alloc()"

parents 257d2683 c6f6c88f

arch/arm/mach-msm/include/mach/msm_smem.h

+2 −2
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ void *smem_alloc2(unsigned id, unsigned size_in); 
void *smem_get_entry(unsigned id, unsigned *size);

void *smem_find(unsigned id, unsigned size);



void *smem_alloc2_to_proc(unsigned id, unsigned size_in, unsigned to_proc,

void *smem_alloc(unsigned id, unsigned size_in, unsigned to_proc,

								unsigned flags);

void *smem_find_to_proc(unsigned id, unsigned size_in, unsigned to_proc,

								unsigned flags);
@@ -211,7 +211,7 @@ static inline void *smem_find(unsigned id, unsigned size) 
{

	return NULL;

}

void *smem_alloc2_to_proc(unsigned id, unsigned size_in, unsigned to_proc,

void *smem_alloc(unsigned id, unsigned size_in, unsigned to_proc,

								unsigned flags)

{

	return NULL;

arch/arm/mach-msm/smd.c

+3 −4
Original line number Diff line number Diff line
@@ -2553,7 +2553,7 @@ static int smsm_init(void) 
			"smsm_snapshot");



	if (!smsm_info.state) {

		smsm_info.state = smem_alloc2_to_proc(ID_SHARED_STATE,

		smsm_info.state = smem_alloc(ID_SHARED_STATE,

						SMSM_NUM_ENTRIES *

						sizeof(uint32_t), 0,

						SMEM_ANY_HOST_FLAG);
@@ -2567,8 +2567,7 @@ static int smsm_init(void) 
	}



	if (!smsm_info.intr_mask) {

		smsm_info.intr_mask = smem_alloc2_to_proc(

						SMEM_SMSM_CPU_INTR_MASK,

		smsm_info.intr_mask = smem_alloc(SMEM_SMSM_CPU_INTR_MASK,

						SMSM_NUM_ENTRIES *

						SMSM_NUM_HOSTS *

						sizeof(uint32_t), 0,
@@ -2587,7 +2586,7 @@ static int smsm_init(void) 
	}



	if (!smsm_info.intr_mux)

		smsm_info.intr_mux = smem_alloc2_to_proc(SMEM_SMD_SMSM_INTR_MUX,

		smsm_info.intr_mux = smem_alloc(SMEM_SMD_SMSM_INTR_MUX,

							SMSM_NUM_INTR_MUX *

							sizeof(uint32_t), 0,

							SMEM_ANY_HOST_FLAG);

arch/arm/mach-msm/smem.c

+4 −4
Original line number Diff line number Diff line
@@ -697,8 +697,8 @@ void *smem_alloc2(unsigned id, unsigned size_in) 
EXPORT_SYMBOL(smem_alloc2);



/**

 * smem_alloc2_to_proc - Find an existing item, otherwise allocate it with

 *				security support

 * smem_alloc - Find an existing item, otherwise allocate it with security

 *		support

 *

 * @id:       ID of SMEM item

 * @size_in:  Size of the SMEM item
@@ -706,7 +706,7 @@ EXPORT_SYMBOL(smem_alloc2); 
 * @flags:    Item attribute flags

 * @returns:  Pointer to SMEM item or NULL if it couldn't be found/allocated

 */

void *smem_alloc2_to_proc(unsigned id, unsigned size_in, unsigned to_proc,

void *smem_alloc(unsigned id, unsigned size_in, unsigned to_proc,

								unsigned flags)

{

	unsigned long lflags;
@@ -775,7 +775,7 @@ void *smem_alloc2_to_proc(unsigned id, unsigned size_in, unsigned to_proc, 
	remote_spin_unlock_irqrestore(&remote_spinlock, lflags);

	return ret;

}

EXPORT_SYMBOL(smem_alloc2_to_proc);

EXPORT_SYMBOL(smem_alloc);



void *smem_get_entry(unsigned id, unsigned *size)

{

arch/arm/mach-msm/smp2p.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static void *smp2p_get_local_smem_item(int remote_pid) 


			if (!item_ptr) {

				size = sizeof(struct smp2p_smem_item);

				item_ptr = smem_alloc2_to_proc(smem_id, size,

				item_ptr = smem_alloc(smem_id, size,

								remote_pid, 0);

			}

		}

arch/arm/mach-msm/smp2p_spinlock_test.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static void smp2p_ut_remote_spinlock_rpm(struct seq_file *s) 
		smem_spinlock = smem_get_remote_spinlock();

		UT_ASSERT_PTR(smem_spinlock, !=, NULL);



		data_ptr = smem_alloc2_to_proc(SMEM_ID_VENDOR0,

		data_ptr = smem_alloc(SMEM_ID_VENDOR0,

				sizeof(struct rpm_spinlock_test), 0,

				SMEM_ANY_HOST_FLAG);

		UT_ASSERT_PTR(0, !=, data_ptr);