Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
3f4d4f4e
Commit
3f4d4f4e
authored
Mar 28, 2002
by
Russell King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Miscellaneous build/bug fixes.
parent
4dfff8c1
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
62 additions
and
75 deletions
+62
-75
arch/arm/kernel/ptrace.c
arch/arm/kernel/ptrace.c
+3
-9
arch/arm/lib/memchr.S
arch/arm/lib/memchr.S
+5
-5
arch/arm/mach-sa1100/generic.c
arch/arm/mach-sa1100/generic.c
+44
-0
arch/arm/mach-sa1100/generic.h
arch/arm/mach-sa1100/generic.h
+2
-0
arch/arm/mach-sa1100/sa1111.c
arch/arm/mach-sa1100/sa1111.c
+0
-44
arch/arm/mach-sa1100/sa1111.h
arch/arm/mach-sa1100/sa1111.h
+0
-10
arch/arm/tools/mach-types
arch/arm/tools/mach-types
+2
-1
drivers/ide/icside.c
drivers/ide/icside.c
+1
-1
drivers/video/cyber2000fb.c
drivers/video/cyber2000fb.c
+3
-5
include/asm-arm/pgalloc.h
include/asm-arm/pgalloc.h
+2
-0
No files found.
arch/arm/kernel/ptrace.c
View file @
3f4d4f4e
...
...
@@ -620,15 +620,9 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
ret
=
ptrace_attach
(
child
);
goto
out_tsk
;
}
ret
=
-
ESRCH
;
if
(
!
(
child
->
ptrace
&
PT_PTRACED
))
goto
out_tsk
;
if
(
child
->
state
!=
TASK_STOPPED
&&
request
!=
PTRACE_KILL
)
goto
out_tsk
;
if
(
child
->
p_pptr
!=
current
)
goto
out_tsk
;
ret
=
do_ptrace
(
request
,
child
,
addr
,
data
);
ret
=
ptrace_check_attach
(
child
,
request
==
PTRACE_KILL
);
if
(
ret
==
0
)
ret
=
do_ptrace
(
request
,
child
,
addr
,
data
);
out_tsk:
put_task_struct
(
child
);
...
...
arch/arm/lib/memchr.S
View file @
3f4d4f4e
...
...
@@ -15,11 +15,11 @@
.
text
.
align
5
ENTRY
(
memchr
)
1
:
ldrb
r3
,
[
r0
],
#
1
1
:
subs
r2
,
r2
,
#
1
bmi
2
f
ldrb
r3
,
[
r0
],
#
1
teq
r3
,
r1
beq
2
f
subs
r2
,
r2
,
#
1
bpl
1
b
bne
1
b
sub
r0
,
r0
,
#
1
2
:
movne
r0
,
#
0
subeq
r0
,
r0
,
#
1
RETINSTR
(
mov
,
pc
,
lr
)
arch/arm/mach-sa1100/generic.c
View file @
3f4d4f4e
...
...
@@ -162,3 +162,47 @@ void __init sa1100_map_io(void)
{
iotable_init
(
standard_io_desc
);
}
/*
* Disable the memory bus request/grant signals on the SA1110 to
* ensure that we don't receive spurious memory requests. We set
* the MBGNT signal false to ensure the SA1111 doesn't own the
* SDRAM bus.
*/
void
__init
sa1110_mb_disable
(
void
)
{
unsigned
long
flags
;
local_irq_save
(
flags
);
PGSR
&=
~
GPIO_MBGNT
;
GPCR
=
GPIO_MBGNT
;
GPDR
=
(
GPDR
&
~
GPIO_MBREQ
)
|
GPIO_MBGNT
;
GAFR
&=
~
(
GPIO_MBGNT
|
GPIO_MBREQ
);
local_irq_restore
(
flags
);
}
/*
* If the system is going to use the SA-1111 DMA engines, set up
* the memory bus request/grant pins.
*/
void
__init
sa1110_mb_enable
(
void
)
{
unsigned
long
flags
;
local_irq_save
(
flags
);
PGSR
&=
~
GPIO_MBGNT
;
GPCR
=
GPIO_MBGNT
;
GPDR
=
(
GPDR
&
~
GPIO_MBREQ
)
|
GPIO_MBGNT
;
GAFR
|=
(
GPIO_MBGNT
|
GPIO_MBREQ
);
TUCR
|=
TUCR_MR
;
local_irq_restore
(
flags
);
}
EXPORT_SYMBOL
(
sa1111_wake
);
EXPORT_SYMBOL
(
sa1111_doze
);
arch/arm/mach-sa1100/generic.h
View file @
3f4d4f4e
...
...
@@ -15,3 +15,5 @@ extern void __init sa1100_init_irq(void);
extern
void
(
*
sa1100fb_backlight_power
)(
int
on
);
extern
void
(
*
sa1100fb_lcd_power
)(
int
on
);
extern
void
sa1110_mb_enable
(
void
);
extern
void
sa1110_mb_disable
(
void
);
arch/arm/mach-sa1100/sa1111.c
View file @
3f4d4f4e
...
...
@@ -367,50 +367,6 @@ void sa1111_configure_smc(int sdram, unsigned int drac, unsigned int cas_latency
SBI_SMCR
=
smcr
;
}
/*
* Disable the memory bus request/grant signals on the SA1110 to
* ensure that we don't receive spurious memory requests. We set
* the MBGNT signal false to ensure the SA1111 doesn't own the
* SDRAM bus.
*/
void
__init
sa1110_mb_disable
(
void
)
{
unsigned
long
flags
;
local_irq_save
(
flags
);
PGSR
&=
~
GPIO_MBGNT
;
GPCR
=
GPIO_MBGNT
;
GPDR
=
(
GPDR
&
~
GPIO_MBREQ
)
|
GPIO_MBGNT
;
GAFR
&=
~
(
GPIO_MBGNT
|
GPIO_MBREQ
);
local_irq_restore
(
flags
);
}
/*
* If the system is going to use the SA-1111 DMA engines, set up
* the memory bus request/grant pins.
*/
void
__init
sa1110_mb_enable
(
void
)
{
unsigned
long
flags
;
local_irq_save
(
flags
);
PGSR
&=
~
GPIO_MBGNT
;
GPCR
=
GPIO_MBGNT
;
GPDR
=
(
GPDR
&
~
GPIO_MBREQ
)
|
GPIO_MBGNT
;
GAFR
|=
(
GPIO_MBGNT
|
GPIO_MBREQ
);
TUCR
|=
TUCR_MR
;
local_irq_restore
(
flags
);
}
EXPORT_SYMBOL
(
sa1111_wake
);
EXPORT_SYMBOL
(
sa1111_doze
);
/* According to the "Intel StrongARM SA-1111 Microprocessor Companion
* Chip Specification Update" (June 2000), erratum #7, there is a
* significant bug in Serial Audio Controller DMA. If the SAC is
...
...
arch/arm/mach-sa1100/sa1111.h
View file @
3f4d4f4e
...
...
@@ -2,12 +2,6 @@
* linux/arch/arm/mach-sa1100/sa1111.h
*/
/*
* These two don't really belong in here.
*/
extern
void
sa1110_mb_enable
(
void
);
extern
void
sa1110_mb_disable
(
void
);
/*
* Probe for a SA1111 chip.
*/
...
...
@@ -27,8 +21,4 @@ extern void sa1111_doze(void);
* Configure the SA1111 shared memory controller.
*/
extern
void
sa1111_configure_smc
(
int
sdram
,
unsigned
int
drac
,
unsigned
int
cas_latency
);
extern
void
sa1111_init_irq
(
int
irq_nr
);
extern
void
sa1111_IRQ_demux
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
);
arch/arm/tools/mach-types
View file @
3f4d4f4e
...
...
@@ -6,7 +6,7 @@
# To add an entry into this database, please see Documentation/arm/README,
# or contact rmk@arm.linux.org.uk
#
# Last update: S
at Mar 16 10:55:44
2002
# Last update: S
un Mar 24 11:48:10
2002
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
...
...
@@ -178,3 +178,4 @@ sam2400 ARCH_SAM2400 SAM2400 166
jornada56x ARCH_JORNADA56X JORNADA56X 167
active SA1100_ACTIVE ACTIVE 168
iq80321 ARCH_IQ80321 IQ80321 169
wid SA1100_WID WID 170
drivers/ide/icside.c
View file @
3f4d4f4e
...
...
@@ -441,7 +441,7 @@ icside_dmaproc(ide_dma_action_t func, ide_drive_t *drive)
:
DMA_MODE_WRITE
);
drive
->
waiting_for_dma
=
1
;
if
(
drive
->
media
!=
ide_disk
)
if
(
drive
->
type
!=
ATA_DISK
)
return
0
;
ide_set_handler
(
drive
,
&
icside_dmaintr
,
WAIT_CMD
,
NULL
);
...
...
drivers/video/cyber2000fb.c
View file @
3f4d4f4e
...
...
@@ -1402,6 +1402,7 @@ cyberpro_alloc_fb_info(unsigned int id, char *name)
cfb
->
fb
.
updatevar
=
cyber2000fb_updatevar
;
cfb
->
fb
.
blank
=
cyber2000fb_blank
;
cfb
->
fb
.
flags
=
FBINFO_FLAG_DEFAULT
;
cfb
->
fb
.
node
=
NODEV
;
cfb
->
fb
.
disp
=
(
struct
display
*
)(
cfb
+
1
);
cfb
->
fb
.
pseudo_palette
=
(
void
*
)(
cfb
->
fb
.
disp
+
1
);
...
...
@@ -1819,7 +1820,7 @@ static struct pci_driver cyberpro_driver = {
*/
int
__init
cyber2000fb_init
(
void
)
{
int
ret
=
-
1
,
err
=
0
;
int
ret
=
-
1
,
err
=
-
ENODEV
;
#ifdef CONFIG_ARCH_SHARK
err
=
cyberpro_vl_probe
();
if
(
!
err
)
{
...
...
@@ -1827,19 +1828,16 @@ int __init cyber2000fb_init(void)
MOD_INC_USE_COUNT
;
}
#endif
#ifdef CONFIG_PCI
err
=
pci_module_init
(
&
cyberpro_driver
);
if
(
!
err
)
ret
=
err
;
#endif
return
ret
?
err
:
0
;
}
static
void
__exit
cyberpro_exit
(
void
)
{
#ifdef CONFIG_PCI
pci_unregister_driver
(
&
cyberpro_driver
);
#endif
}
#ifdef MODULE
...
...
include/asm-arm/pgalloc.h
View file @
3f4d4f4e
...
...
@@ -30,4 +30,6 @@ extern void free_pgd_slow(pgd_t *pgd);
#define pgd_alloc(mm) get_pgd_slow(mm)
#define pgd_free(pgd) free_pgd_slow(pgd)
#define check_pgt_cache() do { } while (0)
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment