mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
Merge 'akpm' patch series
* Merge akpm patch series: (122 commits) drivers/connector/cn_proc.c: remove unused local Documentation/SubmitChecklist: add RCU debug config options reiserfs: use hweight_long() reiserfs: use proper little-endian bitops pnpacpi: register disabled resources drivers/rtc/rtc-tegra.c: properly initialize spinlock drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time() drivers/rtc: add support for Qualcomm PMIC8xxx RTC drivers/rtc/rtc-s3c.c: support clock gating drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200 init: skip calibration delay if previously done misc/eeprom: add eeprom access driver for digsy_mtc board misc/eeprom: add driver for microwire 93xx46 EEPROMs checkpatch.pl: update $logFunctions checkpatch: make utf-8 test --strict checkpatch.pl: add ability to ignore various messages checkpatch: add a "prefer __aligned" check checkpatch: validate signature styles and To: and Cc: lines checkpatch: add __rcu as a sparse modifier checkpatch: suggest using min_t or max_t ... Did this as a merge because of (trivial) conflicts in - Documentation/feature-removal-schedule.txt - arch/xtensa/include/asm/uaccess.h that were just easier to fix up in the merge than in the patch series.
This commit is contained in:
Linus Torvalds
commit
45b583b10a
160 changed files with 5261 additions and 1090 deletions
|
|
@ -70,6 +70,39 @@ enum {
|
|||
CPU_PRI_WORKQUEUE = 5,
|
||||
};
|
||||
|
||||
#define CPU_ONLINE 0x0002 /* CPU (unsigned)v is up */
|
||||
#define CPU_UP_PREPARE 0x0003 /* CPU (unsigned)v coming up */
|
||||
#define CPU_UP_CANCELED 0x0004 /* CPU (unsigned)v NOT coming up */
|
||||
#define CPU_DOWN_PREPARE 0x0005 /* CPU (unsigned)v going down */
|
||||
#define CPU_DOWN_FAILED 0x0006 /* CPU (unsigned)v NOT going down */
|
||||
#define CPU_DEAD 0x0007 /* CPU (unsigned)v dead */
|
||||
#define CPU_DYING 0x0008 /* CPU (unsigned)v not running any task,
|
||||
* not handling interrupts, soon dead.
|
||||
* Called on the dying cpu, interrupts
|
||||
* are already disabled. Must not
|
||||
* sleep, must not fail */
|
||||
#define CPU_POST_DEAD 0x0009 /* CPU (unsigned)v dead, cpu_hotplug
|
||||
* lock is dropped */
|
||||
#define CPU_STARTING 0x000A /* CPU (unsigned)v soon running.
|
||||
* Called on the new cpu, just before
|
||||
* enabling interrupts. Must not sleep,
|
||||
* must not fail */
|
||||
|
||||
/* Used for CPU hotplug events occurring while tasks are frozen due to a suspend
|
||||
* operation in progress
|
||||
*/
|
||||
#define CPU_TASKS_FROZEN 0x0010
|
||||
|
||||
#define CPU_ONLINE_FROZEN (CPU_ONLINE | CPU_TASKS_FROZEN)
|
||||
#define CPU_UP_PREPARE_FROZEN (CPU_UP_PREPARE | CPU_TASKS_FROZEN)
|
||||
#define CPU_UP_CANCELED_FROZEN (CPU_UP_CANCELED | CPU_TASKS_FROZEN)
|
||||
#define CPU_DOWN_PREPARE_FROZEN (CPU_DOWN_PREPARE | CPU_TASKS_FROZEN)
|
||||
#define CPU_DOWN_FAILED_FROZEN (CPU_DOWN_FAILED | CPU_TASKS_FROZEN)
|
||||
#define CPU_DEAD_FROZEN (CPU_DEAD | CPU_TASKS_FROZEN)
|
||||
#define CPU_DYING_FROZEN (CPU_DYING | CPU_TASKS_FROZEN)
|
||||
#define CPU_STARTING_FROZEN (CPU_STARTING | CPU_TASKS_FROZEN)
|
||||
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
/* Need to know about CPUs going up/down? */
|
||||
#if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE)
|
||||
|
|
|
|||
|
|
@ -52,4 +52,13 @@ static inline unsigned char __toupper(unsigned char c)
|
|||
#define tolower(c) __tolower(c)
|
||||
#define toupper(c) __toupper(c)
|
||||
|
||||
/*
|
||||
* Fast implementation of tolower() for internal usage. Do not use in your
|
||||
* code.
|
||||
*/
|
||||
static inline char _tolower(const char c)
|
||||
{
|
||||
return c | 0x20;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
18
include/linux/eeprom_93xx46.h
Normal file
18
include/linux/eeprom_93xx46.h
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
/*
|
||||
* Module: eeprom_93xx46
|
||||
* platform description for 93xx46 EEPROMs.
|
||||
*/
|
||||
|
||||
struct eeprom_93xx46_platform_data {
|
||||
unsigned char flags;
|
||||
#define EE_ADDR8 0x01 /* 8 bit addr. cfg */
|
||||
#define EE_ADDR16 0x02 /* 16 bit addr. cfg */
|
||||
#define EE_READONLY 0x08 /* forbid writing */
|
||||
|
||||
/*
|
||||
* optional hooks to control additional logic
|
||||
* before and after spi transfer.
|
||||
*/
|
||||
void (*prepare)(void *);
|
||||
void (*finish)(void *);
|
||||
};
|
||||
|
|
@ -231,6 +231,9 @@ struct hstate {
|
|||
struct huge_bootmem_page {
|
||||
struct list_head list;
|
||||
struct hstate *hstate;
|
||||
#ifdef CONFIG_HIGHMEM
|
||||
phys_addr_t phys;
|
||||
#endif
|
||||
};
|
||||
|
||||
struct page *alloc_huge_page_node(struct hstate *h, int nid);
|
||||
|
|
|
|||
|
|
@ -109,6 +109,36 @@ struct resource_list {
|
|||
/* PCI control bits. Shares IORESOURCE_BITS with above PCI ROM. */
|
||||
#define IORESOURCE_PCI_FIXED (1<<4) /* Do not move resource */
|
||||
|
||||
|
||||
/* helpers to define resources */
|
||||
#define DEFINE_RES_NAMED(_start, _size, _name, _flags) \
|
||||
{ \
|
||||
.start = (_start), \
|
||||
.end = (_start) + (_size) - 1, \
|
||||
.name = (_name), \
|
||||
.flags = (_flags), \
|
||||
}
|
||||
|
||||
#define DEFINE_RES_IO_NAMED(_start, _size, _name) \
|
||||
DEFINE_RES_NAMED((_start), (_size), (_name), IORESOURCE_IO)
|
||||
#define DEFINE_RES_IO(_start, _size) \
|
||||
DEFINE_RES_IO_NAMED((_start), (_size), NULL)
|
||||
|
||||
#define DEFINE_RES_MEM_NAMED(_start, _size, _name) \
|
||||
DEFINE_RES_NAMED((_start), (_size), (_name), IORESOURCE_MEM)
|
||||
#define DEFINE_RES_MEM(_start, _size) \
|
||||
DEFINE_RES_MEM_NAMED((_start), (_size), NULL)
|
||||
|
||||
#define DEFINE_RES_IRQ_NAMED(_irq, _name) \
|
||||
DEFINE_RES_NAMED((_irq), 1, (_name), IORESOURCE_IRQ)
|
||||
#define DEFINE_RES_IRQ(_irq) \
|
||||
DEFINE_RES_IRQ_NAMED((_irq), NULL)
|
||||
|
||||
#define DEFINE_RES_DMA_NAMED(_dma, _name) \
|
||||
DEFINE_RES_NAMED((_dma), 1, (_name), IORESOURCE_DMA)
|
||||
#define DEFINE_RES_DMA(_dma) \
|
||||
DEFINE_RES_DMA_NAMED((_dma), NULL)
|
||||
|
||||
/* PC/ISA/whatever - the normal PC address spaces: IO and memory */
|
||||
extern struct resource ioport_resource;
|
||||
extern struct resource iomem_resource;
|
||||
|
|
|
|||
|
|
@ -646,29 +646,6 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
|
|||
const typeof( ((type *)0)->member ) *__mptr = (ptr); \
|
||||
(type *)( (char *)__mptr - offsetof(type,member) );})
|
||||
|
||||
struct sysinfo;
|
||||
extern int do_sysinfo(struct sysinfo *info);
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#define SI_LOAD_SHIFT 16
|
||||
struct sysinfo {
|
||||
long uptime; /* Seconds since boot */
|
||||
unsigned long loads[3]; /* 1, 5, and 15 minute load averages */
|
||||
unsigned long totalram; /* Total usable main memory size */
|
||||
unsigned long freeram; /* Available memory size */
|
||||
unsigned long sharedram; /* Amount of shared memory */
|
||||
unsigned long bufferram; /* Memory used by buffers */
|
||||
unsigned long totalswap; /* Total swap space size */
|
||||
unsigned long freeswap; /* swap space still available */
|
||||
unsigned short procs; /* Number of current processes */
|
||||
unsigned short pad; /* explicit padding for m68k */
|
||||
unsigned long totalhigh; /* Total high memory size */
|
||||
unsigned long freehigh; /* Available high memory size */
|
||||
unsigned int mem_unit; /* Memory unit size in bytes */
|
||||
char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */
|
||||
};
|
||||
|
||||
#ifdef __CHECKER__
|
||||
#define BUILD_BUG_ON_NOT_POWER_OF_2(n)
|
||||
#define BUILD_BUG_ON_ZERO(e) (0)
|
||||
|
|
@ -736,4 +713,27 @@ extern int __build_bug_on_failed;
|
|||
# define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
|
||||
#endif
|
||||
|
||||
struct sysinfo;
|
||||
extern int do_sysinfo(struct sysinfo *info);
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#define SI_LOAD_SHIFT 16
|
||||
struct sysinfo {
|
||||
long uptime; /* Seconds since boot */
|
||||
unsigned long loads[3]; /* 1, 5, and 15 minute load averages */
|
||||
unsigned long totalram; /* Total usable main memory size */
|
||||
unsigned long freeram; /* Available memory size */
|
||||
unsigned long sharedram; /* Amount of shared memory */
|
||||
unsigned long bufferram; /* Memory used by buffers */
|
||||
unsigned long totalswap; /* Total swap space size */
|
||||
unsigned long freeswap; /* swap space still available */
|
||||
unsigned short procs; /* Number of current processes */
|
||||
unsigned short pad; /* explicit padding for m68k */
|
||||
unsigned long totalhigh; /* Total high memory size */
|
||||
unsigned long freehigh; /* Available high memory size */
|
||||
unsigned int mem_unit; /* Memory unit size in bytes */
|
||||
char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -84,6 +84,8 @@ enum lm3530_als_mode {
|
|||
* @brt_ramp_rise: rate of rise of led current
|
||||
* @als1_resistor_sel: internal resistance from ALS1 input to ground
|
||||
* @als2_resistor_sel: internal resistance from ALS2 input to ground
|
||||
* @als_vmin: als input voltage calibrated for max brightness in mV
|
||||
* @als_vmax: als input voltage calibrated for min brightness in mV
|
||||
* @brt_val: brightness value (0-255)
|
||||
*/
|
||||
struct lm3530_platform_data {
|
||||
|
|
@ -101,6 +103,9 @@ struct lm3530_platform_data {
|
|||
u8 als1_resistor_sel;
|
||||
u8 als2_resistor_sel;
|
||||
|
||||
u32 als_vmin;
|
||||
u32 als_vmax;
|
||||
|
||||
u8 brt_val;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -68,12 +68,19 @@ static inline void zone_seqlock_init(struct zone *zone)
|
|||
extern int zone_grow_free_lists(struct zone *zone, unsigned long new_nr_pages);
|
||||
extern int zone_grow_waitqueues(struct zone *zone, unsigned long nr_pages);
|
||||
extern int add_one_highpage(struct page *page, int pfn, int bad_ppro);
|
||||
/* need some defines for these for archs that don't support it */
|
||||
extern void online_page(struct page *page);
|
||||
/* VM interface that may be used by firmware interface */
|
||||
extern int online_pages(unsigned long, unsigned long);
|
||||
extern void __offline_isolated_pages(unsigned long, unsigned long);
|
||||
|
||||
typedef void (*online_page_callback_t)(struct page *page);
|
||||
|
||||
extern int set_online_page_callback(online_page_callback_t callback);
|
||||
extern int restore_online_page_callback(online_page_callback_t callback);
|
||||
|
||||
extern void __online_page_set_limits(struct page *page);
|
||||
extern void __online_page_increment_counters(struct page *page);
|
||||
extern void __online_page_free(struct page *page);
|
||||
|
||||
#ifdef CONFIG_MEMORY_HOTREMOVE
|
||||
extern bool is_pageblock_removable_nolock(struct page *page);
|
||||
#endif /* CONFIG_MEMORY_HOTREMOVE */
|
||||
|
|
|
|||
25
include/linux/mfd/pm8xxx/rtc.h
Normal file
25
include/linux/mfd/pm8xxx/rtc.h
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 and
|
||||
* only version 2 as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef __RTC_PM8XXX_H__
|
||||
#define __RTC_PM8XXX_H__
|
||||
|
||||
#define PM8XXX_RTC_DEV_NAME "rtc-pm8xxx"
|
||||
/**
|
||||
* struct pm8xxx_rtc_pdata - RTC driver platform data
|
||||
* @rtc_write_enable: variable stating RTC write capability
|
||||
*/
|
||||
struct pm8xxx_rtc_platform_data {
|
||||
bool rtc_write_enable;
|
||||
};
|
||||
|
||||
#endif /* __RTC_PM8XXX_H__ */
|
||||
|
|
@ -637,7 +637,7 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)
|
|||
#define SECTIONS_MASK ((1UL << SECTIONS_WIDTH) - 1)
|
||||
#define ZONEID_MASK ((1UL << ZONEID_SHIFT) - 1)
|
||||
|
||||
static inline enum zone_type page_zonenum(struct page *page)
|
||||
static inline enum zone_type page_zonenum(const struct page *page)
|
||||
{
|
||||
return (page->flags >> ZONES_PGSHIFT) & ZONES_MASK;
|
||||
}
|
||||
|
|
@ -665,15 +665,15 @@ static inline int zone_to_nid(struct zone *zone)
|
|||
}
|
||||
|
||||
#ifdef NODE_NOT_IN_PAGE_FLAGS
|
||||
extern int page_to_nid(struct page *page);
|
||||
extern int page_to_nid(const struct page *page);
|
||||
#else
|
||||
static inline int page_to_nid(struct page *page)
|
||||
static inline int page_to_nid(const struct page *page)
|
||||
{
|
||||
return (page->flags >> NODES_PGSHIFT) & NODES_MASK;
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline struct zone *page_zone(struct page *page)
|
||||
static inline struct zone *page_zone(const struct page *page)
|
||||
{
|
||||
return &NODE_DATA(page_to_nid(page))->node_zones[page_zonenum(page)];
|
||||
}
|
||||
|
|
@ -718,9 +718,9 @@ static inline void set_page_links(struct page *page, enum zone_type zone,
|
|||
*/
|
||||
#include <linux/vmstat.h>
|
||||
|
||||
static __always_inline void *lowmem_page_address(struct page *page)
|
||||
static __always_inline void *lowmem_page_address(const struct page *page)
|
||||
{
|
||||
return __va(PFN_PHYS(page_to_pfn(page)));
|
||||
return __va(PFN_PHYS(page_to_pfn((struct page *)page)));
|
||||
}
|
||||
|
||||
#if defined(CONFIG_HIGHMEM) && !defined(WANT_PAGE_VIRTUAL)
|
||||
|
|
@ -911,6 +911,8 @@ unsigned long unmap_vmas(struct mmu_gather *tlb,
|
|||
* @pte_entry: if set, called for each non-empty PTE (4th-level) entry
|
||||
* @pte_hole: if set, called for each hole at all levels
|
||||
* @hugetlb_entry: if set, called for each hugetlb entry
|
||||
* *Caution*: The caller must hold mmap_sem() if @hugetlb_entry
|
||||
* is used.
|
||||
*
|
||||
* (see walk_page_range for more details)
|
||||
*/
|
||||
|
|
@ -986,6 +988,8 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
|
|||
int get_user_pages_fast(unsigned long start, int nr_pages, int write,
|
||||
struct page **pages);
|
||||
struct page *get_dump_page(unsigned long addr);
|
||||
extern int fixup_user_fault(struct task_struct *tsk, struct mm_struct *mm,
|
||||
unsigned long address, unsigned int fault_flags);
|
||||
|
||||
extern int try_to_release_page(struct page * page, gfp_t gfp_mask);
|
||||
extern void do_invalidatepage(struct page *page, unsigned long offset);
|
||||
|
|
@ -1409,8 +1413,7 @@ extern int do_munmap(struct mm_struct *, unsigned long, size_t);
|
|||
|
||||
extern unsigned long do_brk(unsigned long, unsigned long);
|
||||
|
||||
/* filemap.c */
|
||||
extern unsigned long page_unuse(struct page *);
|
||||
/* truncate.c */
|
||||
extern void truncate_inode_pages(struct address_space *, loff_t);
|
||||
extern void truncate_inode_pages_range(struct address_space *,
|
||||
loff_t lstart, loff_t lend);
|
||||
|
|
|
|||
|
|
@ -1521,6 +1521,39 @@ struct packet_type {
|
|||
|
||||
#include <linux/notifier.h>
|
||||
|
||||
/* netdevice notifier chain. Please remember to update the rtnetlink
|
||||
* notification exclusion list in rtnetlink_event() when adding new
|
||||
* types.
|
||||
*/
|
||||
#define NETDEV_UP 0x0001 /* For now you can't veto a device up/down */
|
||||
#define NETDEV_DOWN 0x0002
|
||||
#define NETDEV_REBOOT 0x0003 /* Tell a protocol stack a network interface
|
||||
detected a hardware crash and restarted
|
||||
- we can use this eg to kick tcp sessions
|
||||
once done */
|
||||
#define NETDEV_CHANGE 0x0004 /* Notify device state change */
|
||||
#define NETDEV_REGISTER 0x0005
|
||||
#define NETDEV_UNREGISTER 0x0006
|
||||
#define NETDEV_CHANGEMTU 0x0007
|
||||
#define NETDEV_CHANGEADDR 0x0008
|
||||
#define NETDEV_GOING_DOWN 0x0009
|
||||
#define NETDEV_CHANGENAME 0x000A
|
||||
#define NETDEV_FEAT_CHANGE 0x000B
|
||||
#define NETDEV_BONDING_FAILOVER 0x000C
|
||||
#define NETDEV_PRE_UP 0x000D
|
||||
#define NETDEV_PRE_TYPE_CHANGE 0x000E
|
||||
#define NETDEV_POST_TYPE_CHANGE 0x000F
|
||||
#define NETDEV_POST_INIT 0x0010
|
||||
#define NETDEV_UNREGISTER_BATCH 0x0011
|
||||
#define NETDEV_RELEASE 0x0012
|
||||
#define NETDEV_NOTIFY_PEERS 0x0013
|
||||
#define NETDEV_JOIN 0x0014
|
||||
|
||||
extern int register_netdevice_notifier(struct notifier_block *nb);
|
||||
extern int unregister_netdevice_notifier(struct notifier_block *nb);
|
||||
extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
|
||||
|
||||
|
||||
extern rwlock_t dev_base_lock; /* Device list lock */
|
||||
|
||||
|
||||
|
|
@ -1603,12 +1636,9 @@ static inline void unregister_netdevice(struct net_device *dev)
|
|||
extern int netdev_refcnt_read(const struct net_device *dev);
|
||||
extern void free_netdev(struct net_device *dev);
|
||||
extern void synchronize_net(void);
|
||||
extern int register_netdevice_notifier(struct notifier_block *nb);
|
||||
extern int unregister_netdevice_notifier(struct notifier_block *nb);
|
||||
extern int init_dummy_netdev(struct net_device *dev);
|
||||
extern void netdev_resync_ops(struct net_device *dev);
|
||||
|
||||
extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
|
||||
extern struct net_device *dev_get_by_index(struct net *net, int ifindex);
|
||||
extern struct net_device *__dev_get_by_index(struct net *net, int ifindex);
|
||||
extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
|
||||
|
|
|
|||
|
|
@ -185,81 +185,18 @@ static inline int notifier_to_errno(int ret)
|
|||
* VC switch chains (for loadable kernel svgalib VC switch helpers) etc...
|
||||
*/
|
||||
|
||||
/* netdevice notifier chain. Please remember to update the rtnetlink
|
||||
* notification exclusion list in rtnetlink_event() when adding new
|
||||
* types.
|
||||
*/
|
||||
#define NETDEV_UP 0x0001 /* For now you can't veto a device up/down */
|
||||
#define NETDEV_DOWN 0x0002
|
||||
#define NETDEV_REBOOT 0x0003 /* Tell a protocol stack a network interface
|
||||
detected a hardware crash and restarted
|
||||
- we can use this eg to kick tcp sessions
|
||||
once done */
|
||||
#define NETDEV_CHANGE 0x0004 /* Notify device state change */
|
||||
#define NETDEV_REGISTER 0x0005
|
||||
#define NETDEV_UNREGISTER 0x0006
|
||||
#define NETDEV_CHANGEMTU 0x0007
|
||||
#define NETDEV_CHANGEADDR 0x0008
|
||||
#define NETDEV_GOING_DOWN 0x0009
|
||||
#define NETDEV_CHANGENAME 0x000A
|
||||
#define NETDEV_FEAT_CHANGE 0x000B
|
||||
#define NETDEV_BONDING_FAILOVER 0x000C
|
||||
#define NETDEV_PRE_UP 0x000D
|
||||
#define NETDEV_PRE_TYPE_CHANGE 0x000E
|
||||
#define NETDEV_POST_TYPE_CHANGE 0x000F
|
||||
#define NETDEV_POST_INIT 0x0010
|
||||
#define NETDEV_UNREGISTER_BATCH 0x0011
|
||||
#define NETDEV_RELEASE 0x0012
|
||||
#define NETDEV_NOTIFY_PEERS 0x0013
|
||||
#define NETDEV_JOIN 0x0014
|
||||
/* CPU notfiers are defined in include/linux/cpu.h. */
|
||||
|
||||
#define SYS_DOWN 0x0001 /* Notify of system down */
|
||||
#define SYS_RESTART SYS_DOWN
|
||||
#define SYS_HALT 0x0002 /* Notify of system halt */
|
||||
#define SYS_POWER_OFF 0x0003 /* Notify of system power off */
|
||||
/* netdevice notifiers are defined in include/linux/netdevice.h */
|
||||
|
||||
/* reboot notifiers are defined in include/linux/reboot.h. */
|
||||
|
||||
/* Hibernation and suspend events are defined in include/linux/suspend.h. */
|
||||
|
||||
/* Virtual Terminal events are defined in include/linux/vt.h. */
|
||||
|
||||
#define NETLINK_URELEASE 0x0001 /* Unicast netlink socket released */
|
||||
|
||||
#define CPU_ONLINE 0x0002 /* CPU (unsigned)v is up */
|
||||
#define CPU_UP_PREPARE 0x0003 /* CPU (unsigned)v coming up */
|
||||
#define CPU_UP_CANCELED 0x0004 /* CPU (unsigned)v NOT coming up */
|
||||
#define CPU_DOWN_PREPARE 0x0005 /* CPU (unsigned)v going down */
|
||||
#define CPU_DOWN_FAILED 0x0006 /* CPU (unsigned)v NOT going down */
|
||||
#define CPU_DEAD 0x0007 /* CPU (unsigned)v dead */
|
||||
#define CPU_DYING 0x0008 /* CPU (unsigned)v not running any task,
|
||||
* not handling interrupts, soon dead.
|
||||
* Called on the dying cpu, interrupts
|
||||
* are already disabled. Must not
|
||||
* sleep, must not fail */
|
||||
#define CPU_POST_DEAD 0x0009 /* CPU (unsigned)v dead, cpu_hotplug
|
||||
* lock is dropped */
|
||||
#define CPU_STARTING 0x000A /* CPU (unsigned)v soon running.
|
||||
* Called on the new cpu, just before
|
||||
* enabling interrupts. Must not sleep,
|
||||
* must not fail */
|
||||
|
||||
/* Used for CPU hotplug events occurring while tasks are frozen due to a suspend
|
||||
* operation in progress
|
||||
*/
|
||||
#define CPU_TASKS_FROZEN 0x0010
|
||||
|
||||
#define CPU_ONLINE_FROZEN (CPU_ONLINE | CPU_TASKS_FROZEN)
|
||||
#define CPU_UP_PREPARE_FROZEN (CPU_UP_PREPARE | CPU_TASKS_FROZEN)
|
||||
#define CPU_UP_CANCELED_FROZEN (CPU_UP_CANCELED | CPU_TASKS_FROZEN)
|
||||
#define CPU_DOWN_PREPARE_FROZEN (CPU_DOWN_PREPARE | CPU_TASKS_FROZEN)
|
||||
#define CPU_DOWN_FAILED_FROZEN (CPU_DOWN_FAILED | CPU_TASKS_FROZEN)
|
||||
#define CPU_DEAD_FROZEN (CPU_DEAD | CPU_TASKS_FROZEN)
|
||||
#define CPU_DYING_FROZEN (CPU_DYING | CPU_TASKS_FROZEN)
|
||||
#define CPU_STARTING_FROZEN (CPU_STARTING | CPU_TASKS_FROZEN)
|
||||
|
||||
/* Hibernation and suspend events */
|
||||
#define PM_HIBERNATION_PREPARE 0x0001 /* Going to hibernate */
|
||||
#define PM_POST_HIBERNATION 0x0002 /* Hibernation finished */
|
||||
#define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */
|
||||
#define PM_POST_SUSPEND 0x0004 /* Suspend finished */
|
||||
#define PM_RESTORE_PREPARE 0x0005 /* Going to restore a saved image */
|
||||
#define PM_POST_RESTORE 0x0006 /* Restore failed */
|
||||
|
||||
/* Console keyboard events.
|
||||
* Note: KBD_KEYCODE is always sent before KBD_UNBOUND_KEYCODE, KBD_UNICODE and
|
||||
* KBD_KEYSYM. */
|
||||
|
|
@ -271,12 +208,5 @@ static inline int notifier_to_errno(int ret)
|
|||
|
||||
extern struct blocking_notifier_head reboot_notifier_list;
|
||||
|
||||
/* Virtual Terminal events. */
|
||||
#define VT_ALLOCATE 0x0001 /* Console got allocated */
|
||||
#define VT_DEALLOCATE 0x0002 /* Console will be deallocated */
|
||||
#define VT_WRITE 0x0003 /* A char got output */
|
||||
#define VT_UPDATE 0x0004 /* A bigger update occurred */
|
||||
#define VT_PREWRITE 0x0005 /* A char is about to be written to the console */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
#endif /* _LINUX_NOTIFIER_H */
|
||||
|
|
|
|||
|
|
@ -64,10 +64,6 @@ static inline void oom_killer_enable(void)
|
|||
oom_killer_disabled = false;
|
||||
}
|
||||
|
||||
/* The badness from the OOM killer */
|
||||
extern unsigned long badness(struct task_struct *p, struct mem_cgroup *mem,
|
||||
const nodemask_t *nodemask, unsigned long uptime);
|
||||
|
||||
extern struct task_struct *find_lock_task_mm(struct task_struct *p);
|
||||
|
||||
/* sysctls */
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ enum pageflags {
|
|||
* Macros to create function definitions for page flags
|
||||
*/
|
||||
#define TESTPAGEFLAG(uname, lname) \
|
||||
static inline int Page##uname(struct page *page) \
|
||||
static inline int Page##uname(const struct page *page) \
|
||||
{ return test_bit(PG_##lname, &page->flags); }
|
||||
|
||||
#define SETPAGEFLAG(uname, lname) \
|
||||
|
|
@ -173,7 +173,7 @@ static inline int __TestClearPage##uname(struct page *page) \
|
|||
__SETPAGEFLAG(uname, lname) __CLEARPAGEFLAG(uname, lname)
|
||||
|
||||
#define PAGEFLAG_FALSE(uname) \
|
||||
static inline int Page##uname(struct page *page) \
|
||||
static inline int Page##uname(const struct page *page) \
|
||||
{ return 0; }
|
||||
|
||||
#define TESTSCFLAG(uname, lname) \
|
||||
|
|
|
|||
|
|
@ -255,26 +255,24 @@ static inline struct page *grab_cache_page(struct address_space *mapping,
|
|||
extern struct page * grab_cache_page_nowait(struct address_space *mapping,
|
||||
pgoff_t index);
|
||||
extern struct page * read_cache_page_async(struct address_space *mapping,
|
||||
pgoff_t index, filler_t *filler,
|
||||
void *data);
|
||||
pgoff_t index, filler_t *filler, void *data);
|
||||
extern struct page * read_cache_page(struct address_space *mapping,
|
||||
pgoff_t index, filler_t *filler,
|
||||
void *data);
|
||||
pgoff_t index, filler_t *filler, void *data);
|
||||
extern struct page * read_cache_page_gfp(struct address_space *mapping,
|
||||
pgoff_t index, gfp_t gfp_mask);
|
||||
extern int read_cache_pages(struct address_space *mapping,
|
||||
struct list_head *pages, filler_t *filler, void *data);
|
||||
|
||||
static inline struct page *read_mapping_page_async(
|
||||
struct address_space *mapping,
|
||||
pgoff_t index, void *data)
|
||||
struct address_space *mapping,
|
||||
pgoff_t index, void *data)
|
||||
{
|
||||
filler_t *filler = (filler_t *)mapping->a_ops->readpage;
|
||||
return read_cache_page_async(mapping, index, filler, data);
|
||||
}
|
||||
|
||||
static inline struct page *read_mapping_page(struct address_space *mapping,
|
||||
pgoff_t index, void *data)
|
||||
pgoff_t index, void *data)
|
||||
{
|
||||
filler_t *filler = (filler_t *)mapping->a_ops->readpage;
|
||||
return read_cache_page(mapping, index, filler, data);
|
||||
|
|
|
|||
27
include/linux/platform_data/fsa9480.h
Normal file
27
include/linux/platform_data/fsa9480.h
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
/*
|
||||
* Copyright (C) 2010 Samsung Electronics
|
||||
* Minkyu Kang <mk7.kang@samsung.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#ifndef _FSA9480_H_
|
||||
#define _FSA9480_H_
|
||||
|
||||
#define FSA9480_ATTACHED 1
|
||||
#define FSA9480_DETACHED 0
|
||||
|
||||
struct fsa9480_platform_data {
|
||||
void (*cfg_gpio) (void);
|
||||
void (*usb_cb) (u8 attached);
|
||||
void (*uart_cb) (u8 attached);
|
||||
void (*charger_cb) (u8 attached);
|
||||
void (*jig_cb) (u8 attached);
|
||||
void (*reset_cb) (void);
|
||||
void (*usb_power) (u8 on);
|
||||
int wakeup;
|
||||
};
|
||||
|
||||
#endif /* _FSA9480_H_ */
|
||||
|
|
@ -40,6 +40,12 @@
|
|||
#define RED_INACTIVE 0x09F911029D74E35BULL /* when obj is inactive */
|
||||
#define RED_ACTIVE 0xD84156C5635688C0ULL /* when obj is active */
|
||||
|
||||
#ifdef CONFIG_PHYS_ADDR_T_64BIT
|
||||
#define MEMBLOCK_INACTIVE 0x3a84fb0144c9e71bULL
|
||||
#else
|
||||
#define MEMBLOCK_INACTIVE 0x44c9e71bUL
|
||||
#endif
|
||||
|
||||
#define SLUB_RED_INACTIVE 0xbb
|
||||
#define SLUB_RED_ACTIVE 0xcc
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,11 @@
|
|||
|
||||
#include <linux/notifier.h>
|
||||
|
||||
#define SYS_DOWN 0x0001 /* Notify of system down */
|
||||
#define SYS_RESTART SYS_DOWN
|
||||
#define SYS_HALT 0x0002 /* Notify of system halt */
|
||||
#define SYS_POWER_OFF 0x0003 /* Notify of system power off */
|
||||
|
||||
extern int register_reboot_notifier(struct notifier_block *);
|
||||
extern int unregister_reboot_notifier(struct notifier_block *);
|
||||
|
||||
|
|
|
|||
|
|
@ -2332,7 +2332,9 @@ __u32 keyed_hash(const signed char *msg, int len);
|
|||
__u32 yura_hash(const signed char *msg, int len);
|
||||
__u32 r5_hash(const signed char *msg, int len);
|
||||
|
||||
#define reiserfs_set_le_bit __set_bit_le
|
||||
#define reiserfs_test_and_set_le_bit __test_and_set_bit_le
|
||||
#define reiserfs_clear_le_bit __clear_bit_le
|
||||
#define reiserfs_test_and_clear_le_bit __test_and_clear_bit_le
|
||||
#define reiserfs_test_le_bit test_bit_le
|
||||
#define reiserfs_find_next_zero_le_bit find_next_zero_bit_le
|
||||
|
|
|
|||
|
|
@ -88,5 +88,7 @@ extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
|
|||
extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
|
||||
extern void splice_shrink_spd(struct pipe_inode_info *,
|
||||
struct splice_pipe_desc *);
|
||||
extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
|
||||
|
||||
extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -268,6 +268,14 @@ static inline int hibernate(void) { return -ENOSYS; }
|
|||
static inline bool system_entering_hibernation(void) { return false; }
|
||||
#endif /* CONFIG_HIBERNATION */
|
||||
|
||||
/* Hibernation and suspend events */
|
||||
#define PM_HIBERNATION_PREPARE 0x0001 /* Going to hibernate */
|
||||
#define PM_POST_HIBERNATION 0x0002 /* Hibernation finished */
|
||||
#define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */
|
||||
#define PM_POST_SUSPEND 0x0004 /* Suspend finished */
|
||||
#define PM_RESTORE_PREPARE 0x0005 /* Going to restore a saved image */
|
||||
#define PM_POST_RESTORE 0x0006 /* Restore failed */
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
void save_processor_state(void);
|
||||
void restore_processor_state(void);
|
||||
|
|
|
|||
|
|
@ -86,6 +86,13 @@ struct vt_setactivate {
|
|||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
/* Virtual Terminal events. */
|
||||
#define VT_ALLOCATE 0x0001 /* Console got allocated */
|
||||
#define VT_DEALLOCATE 0x0002 /* Console will be deallocated */
|
||||
#define VT_WRITE 0x0003 /* A char got output */
|
||||
#define VT_UPDATE 0x0004 /* A bigger update occurred */
|
||||
#define VT_PREWRITE 0x0005 /* A char is about to be written to the console */
|
||||
|
||||
#ifdef CONFIG_VT_CONSOLE
|
||||
|
||||
extern int vt_kmsg_redirect(int new);
|
||||
|
|
|
|||
Loading…
Reference in a new issue