HelenOS-historicHelenOSHelenOS-doc

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kernel/trunk/generic/ @ 785

  → /kernel/trunk/generic/ @ 786

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 785 → Rev 786

/kernel/trunk/generic/include/mm/frame.h
61,6 → 61,10
#define ZONE_BLACKLIST_SIZE 8
#define frame_alloc(order, flags) frame_alloc_generic(order, flags, NULL, NULL)
#define frame_alloc_rc(order, flags, status) frame_alloc_generic(order, flags, status, NULL)
#define frame_alloc_rc_zone(order, flags, status, zone) frame_alloc_generic(order, flags, status, zone)
struct zone {
link_t link; /**< link to previous and next zone */
101,7 → 105,9
extern void frame_init(void);
extern void frame_initialize(frame_t *frame, zone_t *zone);
__address frame_alloc(int flags, __u8 order, int * status, zone_t **pzone);
__address frame_alloc_generic(__u8 order, int flags, int * status, zone_t **pzone);
extern void frame_free(__address addr);
zone_t * get_zone_by_frame(frame_t * frame);

/kernel/trunk/generic/src/proc/thread.c
166,9 → 166,9
spinlock_initialize(&t->lock, "thread_t_lock");
frame_ks = frame_alloc(FRAME_KA, ONE_FRAME, NULL, NULL);
frame_ks = frame_alloc(ONE_FRAME, FRAME_KA);
if (THREAD_USER_STACK & flags) {
frame_us = frame_alloc(FRAME_KA, ONE_FRAME, NULL,NULL);
frame_us = frame_alloc(ONE_FRAME, FRAME_KA);
}
ipl = interrupts_disable();

/kernel/trunk/generic/src/cpu/cpu.c
61,7 → 61,7
memsetb((__address) cpus, sizeof(cpu_t) * config.cpu_count, 0);
for (i=0; i < config.cpu_count; i++) {
cpus[i].stack = (__u8 *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME, NULL, NULL);
cpus[i].stack = (__u8 *) frame_alloc(ONE_FRAME, FRAME_KA | FRAME_PANIC);
cpus[i].id = i;

/kernel/trunk/generic/src/mm/slab.c
155,7 → 155,7
int status;
frame_t *frame;
data = (void *)frame_alloc(FRAME_KA | flags, cache->order, &status, &zone);
data = (void *)frame_alloc_rc_zone(cache->order, FRAME_KA | flags, &status, &zone);
if (status != FRAME_OK) {
return NULL;
}

/kernel/trunk/generic/src/mm/as.c
256,7 → 256,7
* do not forget to distinguish between
* the different causes
*/
frame = frame_alloc(0, ONE_FRAME, NULL, NULL);
frame = frame_alloc(ONE_FRAME, 0);
memsetb(PA2KA(frame), FRAME_SIZE, 0);
/*

/kernel/trunk/generic/src/mm/frame.c
109,7 → 109,7
*
* @return Allocated frame.
*/
__address frame_alloc(int flags, __u8 order, int * status, zone_t **pzone)
__address frame_alloc_generic(__u8 order, int flags, int * status, zone_t **pzone)
{
ipl_t ipl;
link_t *tmp;