xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic

Browse Source 
Patches from David Howells <dhowells@redhat.com>:

This is to complete part of the UAPI disintegration for which the
preparatory patches were pulled recently.

Note that there are some fixup patches which are at the base of the
branch aimed at you, plus all arches get the asm-generic branch merged in too.

* 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: (Scripted) Disintegrate include/asm-generic
  UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)
  c6x: remove c6x signal.h
  UAPI: Split compound conditionals containing __KERNEL__ in Arm64
  UAPI: Fix the guards on various asm/unistd.h files

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2012-10-04 22:57:00 +02:00
parent e7a570ff7d 8a1ab3155c
commit c37d6154c0
6983 changed files with 378767 additions and 209522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/m68k/include/asm/apollohw.h
View File

@@ -46,18 +46,6 @@ struct SCN2681 {
};
#if 0
struct mc146818 {
unsigned int second1:4, second2:4, alarm_second1:4, alarm_second2:4,
minute1:4, minute2:4, alarm_minute1:4, alarm_minute2:4;
unsigned int hours1:4, hours2:4, alarm_hours1:4, alarm_hours2:4,
day_of_week1:4, day_of_week2:4, day_of_month1:4, day_of_month2:4;
unsigned int month1:4, month2:4, year1:4, year2:4, :16;
};
#endif
struct mc146818 {
unsigned char second, alarm_second;
unsigned char minute, alarm_minute;

4
arch/m68k/include/asm/cacheflush.h
View File

@@ -1,5 +1,5 @@
#ifdef __uClinux__
#include "cacheflush_no.h"
#include <asm/cacheflush_no.h>
#else
#include "cacheflush_mm.h"
#include <asm/cacheflush_mm.h>
#endif

4
arch/m68k/include/asm/io.h
View File

@@ -1,5 +1,5 @@
#ifdef __uClinux__
#include "io_no.h"
#include <asm/io_no.h>
#else
#include "io_mm.h"
#include <asm/io_mm.h>
#endif

8
arch/m68k/include/asm/m68360.h
View File

@@ -1,7 +1,7 @@
#include "m68360_regs.h"
#include "m68360_pram.h"
#include "m68360_quicc.h"
#include "m68360_enet.h"
#include <asm/m68360_regs.h>
#include <asm/m68360_pram.h>
#include <asm/m68360_quicc.h>
#include <asm/m68360_enet.h>
#ifdef CONFIG_M68360

2
arch/m68k/include/asm/m68360_enet.h
View File

@@ -10,7 +10,7 @@
#ifndef __ETHER_H
#define __ETHER_H
#include "quicc_simple.h"
#include <asm/quicc_simple.h>
/*
* transmit BD's

4
arch/m68k/include/asm/page.h
View File

@@ -43,9 +43,9 @@ extern unsigned long _ramend;
#endif /* !__ASSEMBLY__ */
#ifdef CONFIG_MMU
#include "page_mm.h"
#include <asm/page_mm.h>
#else
#include "page_no.h"
#include <asm/page_no.h>
#endif
#include <asm-generic/getorder.h>

4
arch/m68k/include/asm/pgtable.h
View File

@@ -1,5 +1,5 @@
#ifdef __uClinux__
#include "pgtable_no.h"
#include <asm/pgtable_no.h>
#else
#include "pgtable_mm.h"
#include <asm/pgtable_mm.h>
#endif

2
arch/m68k/include/asm/q40_master.h
View File

@@ -60,7 +60,7 @@
#define Q40_RTC_WRITE 128
/* define some Q40 specific ints */
#include "q40ints.h"
#include <asm/q40ints.h>
/* misc defs */
#define DAC_LEFT ((unsigned char *)0xff008000)

4
arch/m68k/include/asm/uaccess.h
View File

@@ -1,5 +1,5 @@
#ifdef __uClinux__
#include "uaccess_no.h"
#include <asm/uaccess_no.h>
#else
#include "uaccess_mm.h"
#include <asm/uaccess_mm.h>
#endif