Merge tag 'v3.10.65' into update
This is the 3.10.65 stable release
This commit is contained in:
+1
-1
@@ -1634,7 +1634,7 @@ extern int expand_downwards(struct vm_area_struct *vma,
|
||||
#if VM_GROWSUP
|
||||
extern int expand_upwards(struct vm_area_struct *vma, unsigned long address);
|
||||
#else
|
||||
#define expand_upwards(vma, address) do { } while (0)
|
||||
#define expand_upwards(vma, address) (0)
|
||||
#endif
|
||||
|
||||
/* Look up the first VMA which satisfies addr < vm_end, NULL if none. */
|
||||
|
||||
@@ -53,7 +53,8 @@ struct persistent_ram_zone {
|
||||
};
|
||||
|
||||
struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,
|
||||
u32 sig, struct persistent_ram_ecc_info *ecc_info);
|
||||
u32 sig, struct persistent_ram_ecc_info *ecc_info,
|
||||
unsigned int memtype);
|
||||
void persistent_ram_free(struct persistent_ram_zone *prz);
|
||||
void persistent_ram_zap(struct persistent_ram_zone *prz);
|
||||
|
||||
@@ -78,6 +79,7 @@ void ramoops_console_write_buf(const char *buf, size_t size);
|
||||
struct ramoops_platform_data {
|
||||
unsigned long mem_size;
|
||||
unsigned long mem_address;
|
||||
unsigned int mem_type;
|
||||
unsigned long record_size;
|
||||
unsigned long console_size;
|
||||
unsigned long ftrace_size;
|
||||
|
||||
Reference in New Issue
Block a user