未验证 提交 f4563520 编写于 作者: O openeuler-ci-bot 提交者: Gitee

!77 [sync] PR-48: Fix kabi header file being repeatedly referenced by the same file

Merge Pull Request from: @openeuler-sync-bot 
 

### 1. Origin pull request:
https://gitee.com/openeuler/kernel/pulls/48

### 2. Original pull request related issue(s):
https://gitee.com/openeuler/kernel/issues/I5JI5Z

### 3. Original pull request related commit(s):
| Sha | Datetime | Message |
|---|---|---|
|[ea2d9be0](https://gitee.com/openeuler/kernel/commits/ea2d9be01d383bc880adc4f6dc4f6fa601a6d50f)|2022-07-29 11:05:52 +0800 CST|Fix kabi header file being repeatedly referenced by the same file<br><br>uniontech inclusion<br>category: cleanup<br>bugzilla: https://gitee.com/openeuler/kernel/issues/I5JI5Z<br>CVE: NA<br><br>---------------------------------------<br><br>In the following header files, the "linux/kabi.h" header file is<br>repeatedly referenced twice, causing the same header file to be<br>included repeatedly:<br><br>	include/linux/blk_types.h<br>	include/linux/cred.h<br>	include/linux/device.h<br>	include/linux/device/class.h<br>	include/linux/ioport.h<br>	include/linux/mm.h<br>	include/linux/swap.h<br><br>Remove redundant "linux/kabi.h" header file references to make<br>the code more canonical.<br><br>Signed-off-by: goutongchen <goutongchen@uniontech.com><br>|
 
 
Link:https://gitee.com/openeuler/kernel/pulls/77 
Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com> 
Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com> 
......@@ -6,7 +6,6 @@
#ifndef __LINUX_BLK_TYPES_H
#define __LINUX_BLK_TYPES_H
#include <linux/kabi.h>
#include <linux/types.h>
#include <linux/bvec.h>
#include <linux/ktime.h>
......
......@@ -8,7 +8,6 @@
#ifndef _LINUX_CRED_H
#define _LINUX_CRED_H
#include <linux/kabi.h>
#include <linux/capability.h>
#include <linux/init.h>
#include <linux/key.h>
......
......@@ -12,7 +12,6 @@
#ifndef _DEVICE_H_
#define _DEVICE_H_
#include <linux/kabi.h>
#include <linux/dev_printk.h>
#include <linux/energy_model.h>
#include <linux/ioport.h>
......
......@@ -14,7 +14,6 @@
#ifndef _DEVICE_CLASS_H_
#define _DEVICE_CLASS_H_
#include <linux/kabi.h>
#include <linux/kobject.h>
#include <linux/klist.h>
#include <linux/pm.h>
......
......@@ -10,7 +10,6 @@
#define _LINUX_IOPORT_H
#ifndef __ASSEMBLY__
#include <linux/kabi.h>
#include <linux/compiler.h>
#include <linux/types.h>
#include <linux/bits.h>
......
......@@ -6,7 +6,6 @@
#ifdef __KERNEL__
#include <linux/kabi.h>
#include <linux/mmdebug.h>
#include <linux/gfp.h>
#include <linux/bug.h>
......
......@@ -2,7 +2,6 @@
#ifndef _LINUX_SWAP_H
#define _LINUX_SWAP_H
#include <linux/kabi.h>
#include <linux/spinlock.h>
#include <linux/linkage.h>
#include <linux/mmzone.h>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册