tjh.dev
+1
-6
arch/powerpc/include/asm/fb.h
+1
-6
arch/powerpc/include/asm/fb.h
···
8
8
unsigned long vm_start, unsigned long vm_end,
9
9
unsigned long offset)
10
10
{
11
-
/*
12
-
* PowerPC's implementation of phys_mem_access_prot() does
13
-
* not use the file argument. Set it to NULL in preparation
14
-
* of later updates to the interface.
15
-
*/
16
-
return phys_mem_access_prot(NULL, PHYS_PFN(offset), vm_end - vm_start, prot);
11
+
return __phys_mem_access_prot(PHYS_PFN(offset), vm_end - vm_start, prot);
17
12
}
18
13
#define pgprot_framebuffer pgprot_framebuffer
19
14
+6
-7
arch/powerpc/include/asm/machdep.h
+6
-7
arch/powerpc/include/asm/machdep.h
···
10
10
#include <linux/export.h>
11
11
12
12
struct pt_regs;
13
-
struct pci_bus;
13
+
struct pci_bus;
14
14
struct device_node;
15
15
struct iommu_table;
16
16
struct rtc_time;
···
78
78
unsigned char (*nvram_read_val)(int addr);
79
79
void (*nvram_write_val)(int addr, unsigned char val);
80
80
ssize_t (*nvram_write)(char *buf, size_t count, loff_t *index);
81
-
ssize_t (*nvram_read)(char *buf, size_t count, loff_t *index);
82
-
ssize_t (*nvram_size)(void);
81
+
ssize_t (*nvram_read)(char *buf, size_t count, loff_t *index);
82
+
ssize_t (*nvram_size)(void);
83
83
void (*nvram_sync)(void);
84
84
85
85
/* Exception handlers */
···
102
102
*/
103
103
long (*feature_call)(unsigned int feature, ...);
104
104
105
-
/* Get legacy PCI/IDE interrupt mapping */
105
+
/* Get legacy PCI/IDE interrupt mapping */
106
106
int (*pci_get_legacy_ide_irq)(struct pci_dev *dev, int channel);
107
-
107
+
108
108
/* Get access protection for /dev/mem */
109
-
pgprot_t (*phys_mem_access_prot)(struct file *file,
110
-
unsigned long pfn,
109
+
pgprot_t (*phys_mem_access_prot)(unsigned long pfn,
111
110
unsigned long size,
112
111
pgprot_t vma_prot);
113
112
+1
-3
arch/powerpc/include/asm/pci.h
+1
-3
arch/powerpc/include/asm/pci.h
···
105
105
extern void of_scan_bus(struct device_node *node, struct pci_bus *bus);
106
106
extern void of_rescan_bus(struct device_node *node, struct pci_bus *bus);
107
107
108
-
struct file;
109
-
extern pgprot_t pci_phys_mem_access_prot(struct file *file,
110
-
unsigned long pfn,
108
+
extern pgprot_t pci_phys_mem_access_prot(unsigned long pfn,
111
109
unsigned long size,
112
110
pgprot_t prot);
113
111
+8
-2
arch/powerpc/include/asm/pgtable.h
+8
-2
arch/powerpc/include/asm/pgtable.h
···
120
120
int ptep_set_access_flags(struct vm_area_struct *vma, unsigned long address,
121
121
pte_t *ptep, pte_t entry, int dirty);
122
122
123
+
pgprot_t __phys_mem_access_prot(unsigned long pfn, unsigned long size,
124
+
pgprot_t vma_prot);
125
+
123
126
struct file;
124
-
pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
125
-
unsigned long size, pgprot_t vma_prot);
127
+
static inline pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
128
+
unsigned long size, pgprot_t vma_prot)
129
+
{
130
+
return __phys_mem_access_prot(pfn, size, vma_prot);
131
+
}
126
132
#define __HAVE_PHYS_MEM_ACCESS_PROT
127
133
128
134
void __update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t *ptep);
+1
-2
arch/powerpc/kernel/pci-common.c
+1
-2
arch/powerpc/kernel/pci-common.c
···
521
521
* PCI device, it tries to find the PCI device first and calls the
522
522
* above routine
523
523
*/
524
-
pgprot_t pci_phys_mem_access_prot(struct file *file,
525
-
unsigned long pfn,
524
+
pgprot_t pci_phys_mem_access_prot(unsigned long pfn,
526
525
unsigned long size,
527
526
pgprot_t prot)
528
527
{
+2
arch/powerpc/kernel/rtas-proc.c
+2
arch/powerpc/kernel/rtas-proc.c
···
752
752
753
753
/**
754
754
* ppc_rtas_rmo_buf_show() - Describe RTAS-addressable region for user space.
755
+
* @m: seq_file output target.
756
+
* @v: Unused.
755
757
*
756
758
* Base + size description of a range of RTAS-addressable memory set
757
759
* aside for user space to use as work area(s) for certain RTAS
+4
-4
arch/powerpc/mm/mem.c
+4
-4
arch/powerpc/mm/mem.c
···
35
35
unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss;
36
36
EXPORT_SYMBOL(empty_zero_page);
37
37
38
-
pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
39
-
unsigned long size, pgprot_t vma_prot)
38
+
pgprot_t __phys_mem_access_prot(unsigned long pfn, unsigned long size,
39
+
pgprot_t vma_prot)
40
40
{
41
41
if (ppc_md.phys_mem_access_prot)
42
-
return ppc_md.phys_mem_access_prot(file, pfn, size, vma_prot);
42
+
return ppc_md.phys_mem_access_prot(pfn, size, vma_prot);
43
43
44
44
if (!page_is_ram(pfn))
45
45
vma_prot = pgprot_noncached(vma_prot);
46
46
47
47
return vma_prot;
48
48
}
49
-
EXPORT_SYMBOL(phys_mem_access_prot);
49
+
EXPORT_SYMBOL(__phys_mem_access_prot);
50
50
51
51
#ifdef CONFIG_MEMORY_HOTPLUG
52
52
static DEFINE_MUTEX(linear_mapping_mutex);
+1
arch/powerpc/platforms/pseries/rtas-work-area.c
+1
arch/powerpc/platforms/pseries/rtas-work-area.c