Unverified Commit 513a415f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4564 v2 reserve space for arm64 related structures 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yuntao Liu <liuyuntao12@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LAK5MCYJEJAI4CW45IJPNJ2DMLDRKWTH/ 
Reserve space for arm64 related structures. Include efi.h, extable.h,
fb.h, processor.h

Yuntao Liu (3):
  kabi: reserve space for efi.h
  kabi: reserve space for fb.h
  kabi: reserve space for processor.h


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I8X87C 
 
Link:https://gitee.com/openeuler/kernel/pulls/4564

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 346b21bf 770360b7

arch/arm64/include/asm/processor.h

+9 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <asm/ptrace.h>

#include <asm/spectre.h>

#include <asm/types.h>

#include <linux/kabi.h>



/*

 * TASK_SIZE - the maximum size of a user space task.
@@ -187,6 +188,14 @@ struct thread_struct { 
	u64			sctlr_user;

	u64			svcr;

	u64			tpidr2_el0;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

	KABI_RESERVE(7)

	KABI_RESERVE(8)

};



static inline unsigned int thread_get_vl(struct thread_struct *thread,

include/linux/efi.h

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/uuid.h>



#include <asm/page.h>

#include <linux/kabi.h>



struct screen_info;
@@ -669,6 +670,8 @@ extern struct efi { 


	struct efi_memory_map		memmap;

	unsigned long			flags;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

} efi;



#define EFI_RT_SUPPORTED_GET_TIME				0x0001

include/linux/fb.h

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/slab.h>



#include <asm/fb.h>

#include <linux/kabi.h>



struct vm_area_struct;

struct fb_info;
@@ -218,6 +219,8 @@ struct fb_deferred_io { 
	struct list_head pagereflist; /* list of pagerefs for touched pages */

	/* callback */

	void (*deferred_io)(struct fb_info *info, struct list_head *pagelist);

	KABI_RESERVE(1)

	KABI_RESERVE(2)

};

#endif
@@ -501,6 +504,10 @@ struct fb_info { 
	void *par;



	bool skip_vt_switch; /* no VT switch on suspend/resume required */

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



/* This will go away