TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'origin'

Browse Source
This commit is contained in:
Trond Myklebust
2007-05-15 16:11:17 -04:00
parent 7531d692d4 0560551dca
commit 6684e323a2
39 changed files with 587 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/init.h
View File

@@ -52,14 +52,9 @@
#endif
/* For assembly routines */
#ifdef CONFIG_HOTPLUG_CPU
#define __INIT .section ".text","ax"
#define __INITDATA .section ".data","aw"
#else
#define __INIT .section ".init.text","ax"
#define __INITDATA .section ".init.data","aw"
#endif
#define __FINIT .previous
#define __INITDATA .section ".init.data","aw"
#ifndef __ASSEMBLY__
/*

8
include/linux/io.h
View File

@@ -27,8 +27,16 @@ struct device;
void __iowrite32_copy(void __iomem *to, const void *from, size_t count);
void __iowrite64_copy(void __iomem *to, const void *from, size_t count);
#ifdef CONFIG_MMU
int ioremap_page_range(unsigned long addr, unsigned long end,
unsigned long phys_addr, pgprot_t prot);
#else
static inline int ioremap_page_range(unsigned long addr, unsigned long end,
unsigned long phys_addr, pgprot_t prot)
{
return 0;
}
#endif
/*
* Managed iomap interface

1
include/linux/pci_ids.h
View File

@@ -1288,6 +1288,7 @@
#define PCI_DEVICE_ID_VIA_8363_0 0x0305
#define PCI_DEVICE_ID_VIA_P4M800CE 0x0314
#define PCI_DEVICE_ID_VIA_P4M890 0x0327
#define PCI_DEVICE_ID_VIA_VT3324 0x0324
#define PCI_DEVICE_ID_VIA_VT3336 0x0336
#define PCI_DEVICE_ID_VIA_8371_0 0x0391
#define PCI_DEVICE_ID_VIA_8501_0 0x0501

6
include/linux/slub_def.h
View File

@@ -60,7 +60,8 @@ struct kmem_cache {
#define KMALLOC_SHIFT_LOW 3
#ifdef CONFIG_LARGE_ALLOCS
#define KMALLOC_SHIFT_HIGH 25
#define KMALLOC_SHIFT_HIGH ((MAX_ORDER + PAGE_SHIFT) =< 25 ? \
(MAX_ORDER + PAGE_SHIFT - 1) : 25)
#else
#if !defined(CONFIG_MMU) || NR_CPUS > 512 || MAX_NUMNODES > 256
#define KMALLOC_SHIFT_HIGH 20
@@ -87,6 +88,9 @@ static inline int kmalloc_index(int size)
*/
WARN_ON_ONCE(size == 0);
if (size >= (1 << KMALLOC_SHIFT_HIGH))
return -1;
if (size > 64 && size <= 96)
return 1;
if (size > 128 && size <= 192)